diff --git a/assets/resources/game/heros/a1.prefab b/assets/resources/game/heros/a1.prefab index 52cd500f..807d63ed 100644 --- a/assets/resources/game/heros/a1.prefab +++ b/assets/resources/game/heros/a1.prefab @@ -34,44 +34,41 @@ "__id__": 37 }, { - "__id__": 68 + "__id__": 48 }, { - "__id__": 80 + "__id__": 57 }, { - "__id__": 89 + "__id__": 66 }, { - "__id__": 98 - }, - { - "__id__": 107 + "__id__": 75 } ], "_active": true, "_components": [ { - "__id__": 116 + "__id__": 84 }, { - "__id__": 118 + "__id__": 86 }, { - "__id__": 120 + "__id__": 88 }, { - "__id__": 122 + "__id__": 90 }, { - "__id__": 124 + "__id__": 92 }, { - "__id__": 126 + "__id__": 94 } ], "_prefab": { - "__id__": 128 + "__id__": 96 }, "_lpos": { "__type__": "cc.Vec3", @@ -738,36 +735,6 @@ }, { "__id__": 47 - }, - { - "__id__": 48 - }, - { - "__id__": 50 - }, - { - "__id__": 52 - }, - { - "__id__": 54 - }, - { - "__id__": 56 - }, - { - "__id__": 58 - }, - { - "__id__": 60 - }, - { - "__id__": 62 - }, - { - "__id__": 64 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -871,387 +838,20 @@ } }, { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { "__id__": 49 }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "dfDOq9MhxDoay0LMIRMSnQ" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 51 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -17.5, - "y": 17.5, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f60pl2DlJHe6zROFPhESAb" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 53 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 17.5, - "y": 17.5, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "6bjiVyWdBBN7a7lOHtLLD8" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 55 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -17.5, - "y": 49.5, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "61mV3EVoRKSqEzNf4Jad08" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 57 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 17.5, - "y": 49.5, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "ecvY99Eo5C/rTXtT/OP/IO" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 59 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -17.5, - "y": 81.5, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f84+vnF/VEqYDK3tF0QuGp" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 17.5, - "y": 81.5, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "caZq97Sx5I7YS9d1NCXwnN" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 63 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -17.5, - "y": 113.5, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "6eVlyjXGxOpaWylzxjBKt9" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 65 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 17.5, - "y": 113.5, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "23G4FX3a9EFo2aB6kZKTBQ" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 67 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -17.5, - "y": 145.5, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "11Pq/Z8VFIsKq4V6G/f3kU" - ] - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 69 - }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 68 - }, - "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", - "__expectedType__": "cc.Prefab" - }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": { - "__id__": 70 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 71 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 72 - }, - "propertyPath": [ - "_name" - ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 72 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 72 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 72 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 72 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 72 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 79 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "87+cbUTwZOXIIFCkVHG/aJ" - ] - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 81 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 80 + "__id__": 48 }, "asset": { "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", @@ -1259,7 +859,7 @@ }, "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { - "__id__": 82 + "__id__": 50 }, "targetOverrides": null }, @@ -1273,19 +873,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 83 + "__id__": 51 }, { - "__id__": 85 + "__id__": 53 }, { - "__id__": 86 + "__id__": 54 }, { - "__id__": 87 + "__id__": 55 }, { - "__id__": 88 + "__id__": 56 } ], "removedComponents": [] @@ -1293,7 +893,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 52 }, "propertyPath": [ "_name" @@ -1309,7 +909,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 52 }, "propertyPath": [ "_lpos" @@ -1324,7 +924,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 52 }, "propertyPath": [ "_lrot" @@ -1340,7 +940,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 52 }, "propertyPath": [ "_euler" @@ -1355,7 +955,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 52 }, "propertyPath": [ "_active" @@ -1369,14 +969,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 90 + "__id__": 58 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 89 + "__id__": 57 }, "asset": { "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90", @@ -1384,7 +984,7 @@ }, "fileId": "0d6ZXmA5dHkZxoGONDL2sE", "instance": { - "__id__": 91 + "__id__": 59 }, "targetOverrides": null }, @@ -1398,19 +998,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 92 + "__id__": 60 }, { - "__id__": 94 + "__id__": 62 }, { - "__id__": 95 + "__id__": 63 }, { - "__id__": 96 + "__id__": 64 }, { - "__id__": 97 + "__id__": 65 } ], "removedComponents": [] @@ -1418,7 +1018,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 93 + "__id__": 61 }, "propertyPath": [ "_name" @@ -1434,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 93 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1449,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 93 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1465,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 93 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1480,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 93 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1494,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 99 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 98 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1509,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 100 + "__id__": 68 }, "targetOverrides": null }, @@ -1523,19 +1123,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 101 + "__id__": 69 }, { - "__id__": 103 + "__id__": 71 }, { - "__id__": 104 + "__id__": 72 }, { - "__id__": 105 + "__id__": 73 }, { - "__id__": 106 + "__id__": 74 } ], "removedComponents": [] @@ -1543,7 +1143,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 102 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1559,7 +1159,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 102 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1574,7 +1174,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 102 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1590,7 +1190,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 102 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1605,7 +1205,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 102 + "__id__": 70 }, "propertyPath": [ "_active" @@ -1619,14 +1219,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 108 + "__id__": 76 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 107 + "__id__": 75 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1634,7 +1234,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 109 + "__id__": 77 }, "targetOverrides": null }, @@ -1648,19 +1248,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 110 + "__id__": 78 }, { - "__id__": 112 + "__id__": 80 }, { - "__id__": 113 + "__id__": 81 }, { - "__id__": 114 + "__id__": 82 }, { - "__id__": 115 + "__id__": 83 } ], "removedComponents": [] @@ -1668,7 +1268,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 111 + "__id__": 79 }, "propertyPath": [ "_name" @@ -1684,7 +1284,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 111 + "__id__": 79 }, "propertyPath": [ "_lpos" @@ -1699,7 +1299,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 111 + "__id__": 79 }, "propertyPath": [ "_lrot" @@ -1715,7 +1315,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 111 + "__id__": 79 }, "propertyPath": [ "_euler" @@ -1730,7 +1330,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 111 + "__id__": 79 }, "propertyPath": [ "_active" @@ -1747,7 +1347,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 85 }, "_contentSize": { "__type__": "cc.Size", @@ -1775,7 +1375,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 87 }, "enabledContactListener": true, "bullet": true, @@ -1809,7 +1409,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 89 }, "tag": 0, "_group": 4, @@ -1843,7 +1443,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 91 }, "anm": { "__id__": 22 @@ -1864,7 +1464,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 93 }, "_id": "" }, @@ -1882,7 +1482,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 127 + "__id__": 95 }, "_id": "" }, @@ -1903,19 +1503,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 107 + "__id__": 75 }, { - "__id__": 98 + "__id__": 66 }, { - "__id__": 89 + "__id__": 57 }, { - "__id__": 80 - }, - { - "__id__": 68 + "__id__": 48 }, { "__id__": 37 diff --git a/assets/resources/game/heros/a2.prefab b/assets/resources/game/heros/a2.prefab index 7d1c2ed9..d0723079 100644 --- a/assets/resources/game/heros/a2.prefab +++ b/assets/resources/game/heros/a2.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 82 + }, + { + "__id__": 84 + }, + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, { "__id__": 92 - }, - { - "__id__": 94 - }, - { - "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 } ], "_prefab": { - "__id__": 104 + "__id__": 94 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,16 +1235,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 } ], "removedComponents": [] @@ -1398,7 +1252,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1414,7 +1268,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1429,7 +1283,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1445,7 +1299,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1467,7 +1321,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 83 }, "_contentSize": { "__type__": "cc.Size", @@ -1495,7 +1349,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 85 }, "enabledContactListener": true, "bullet": true, @@ -1529,7 +1383,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "tag": 0, "_group": 4, @@ -1563,7 +1417,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "anm": { "__id__": 22 @@ -1584,7 +1438,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "_id": "" }, @@ -1602,7 +1456,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "_id": "" }, @@ -1623,13 +1477,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/a3.prefab b/assets/resources/game/heros/a3.prefab index a5a3271d..d8261e99 100644 --- a/assets/resources/game/heros/a3.prefab +++ b/assets/resources/game/heros/a3.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/a4.prefab b/assets/resources/game/heros/a4.prefab index b04c6258..68924593 100644 --- a/assets/resources/game/heros/a4.prefab +++ b/assets/resources/game/heros/a4.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/a5.prefab b/assets/resources/game/heros/a5.prefab index 21e21e03..7887a4dd 100644 --- a/assets/resources/game/heros/a5.prefab +++ b/assets/resources/game/heros/a5.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/a6.prefab b/assets/resources/game/heros/a6.prefab index 8cadb949..27763240 100644 --- a/assets/resources/game/heros/a6.prefab +++ b/assets/resources/game/heros/a6.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/cz1.prefab b/assets/resources/game/heros/cz1.prefab index 159e6da5..f92e5cad 100644 --- a/assets/resources/game/heros/cz1.prefab +++ b/assets/resources/game/heros/cz1.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 85 + "__id__": 75 } ], "_active": true, "_components": [ + { + "__id__": 84 + }, + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, { "__id__": 94 - }, - { - "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 } ], "_prefab": { - "__id__": 106 + "__id__": 96 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,19 +1123,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 }, { - "__id__": 84 + "__id__": 74 } ], "removedComponents": [] @@ -1289,7 +1143,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1305,7 +1159,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1320,7 +1174,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1336,7 +1190,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1351,7 +1205,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_active" @@ -1365,14 +1219,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 86 + "__id__": 76 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 85 + "__id__": 75 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1380,7 +1234,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 87 + "__id__": 77 }, "targetOverrides": null }, @@ -1394,19 +1248,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 88 + "__id__": 78 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 } ], "removedComponents": [] @@ -1414,7 +1268,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_name" @@ -1430,7 +1284,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_lpos" @@ -1445,7 +1299,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_lrot" @@ -1461,7 +1315,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_euler" @@ -1476,7 +1330,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_active" @@ -1493,7 +1347,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 85 }, "_contentSize": { "__type__": "cc.Size", @@ -1521,7 +1375,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "enabledContactListener": true, "bullet": true, @@ -1555,7 +1409,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "tag": 0, "_group": 4, @@ -1589,7 +1443,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "anm": { "__id__": 22 @@ -1610,7 +1464,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "_id": "" }, @@ -1628,7 +1482,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1649,13 +1503,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 85 + "__id__": 75 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/d1.prefab b/assets/resources/game/heros/d1.prefab index 398379e3..d58b97c7 100644 --- a/assets/resources/game/heros/d1.prefab +++ b/assets/resources/game/heros/d1.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 85 + "__id__": 75 } ], "_active": true, "_components": [ + { + "__id__": 84 + }, + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, { "__id__": 94 - }, - { - "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 } ], "_prefab": { - "__id__": 106 + "__id__": 96 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,19 +1123,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 }, { - "__id__": 84 + "__id__": 74 } ], "removedComponents": [] @@ -1289,7 +1143,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1305,7 +1159,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1320,7 +1174,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1336,7 +1190,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1351,7 +1205,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_active" @@ -1365,14 +1219,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 86 + "__id__": 76 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 85 + "__id__": 75 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1380,7 +1234,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 87 + "__id__": 77 }, "targetOverrides": null }, @@ -1394,19 +1248,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 88 + "__id__": 78 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 } ], "removedComponents": [] @@ -1414,7 +1268,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_name" @@ -1430,7 +1284,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_lpos" @@ -1445,7 +1299,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_lrot" @@ -1461,7 +1315,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_euler" @@ -1476,7 +1330,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_active" @@ -1493,7 +1347,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 85 }, "_contentSize": { "__type__": "cc.Size", @@ -1521,7 +1375,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "enabledContactListener": true, "bullet": true, @@ -1555,7 +1409,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "tag": 0, "_group": 4, @@ -1589,7 +1443,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "anm": { "__id__": 22 @@ -1610,7 +1464,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "_id": "" }, @@ -1628,7 +1482,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1649,13 +1503,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 85 + "__id__": 75 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/d2.prefab b/assets/resources/game/heros/d2.prefab index d074aaf3..db88a92c 100644 --- a/assets/resources/game/heros/d2.prefab +++ b/assets/resources/game/heros/d2.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 85 + "__id__": 75 } ], "_active": true, "_components": [ + { + "__id__": 84 + }, + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, { "__id__": 94 - }, - { - "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 } ], "_prefab": { - "__id__": 106 + "__id__": 96 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,19 +1123,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 }, { - "__id__": 84 + "__id__": 74 } ], "removedComponents": [] @@ -1289,7 +1143,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1305,7 +1159,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1320,7 +1174,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1336,7 +1190,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1351,7 +1205,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_active" @@ -1365,14 +1219,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 86 + "__id__": 76 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 85 + "__id__": 75 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1380,7 +1234,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 87 + "__id__": 77 }, "targetOverrides": null }, @@ -1394,19 +1248,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 88 + "__id__": 78 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 } ], "removedComponents": [] @@ -1414,7 +1268,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_name" @@ -1430,7 +1284,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_lpos" @@ -1445,7 +1299,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_lrot" @@ -1461,7 +1315,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_euler" @@ -1476,7 +1330,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_active" @@ -1493,7 +1347,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 85 }, "_contentSize": { "__type__": "cc.Size", @@ -1521,7 +1375,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "enabledContactListener": true, "bullet": true, @@ -1555,7 +1409,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "tag": 0, "_group": 4, @@ -1589,7 +1443,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "anm": { "__id__": 22 @@ -1610,7 +1464,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "_id": "" }, @@ -1628,7 +1482,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1649,13 +1503,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 85 + "__id__": 75 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/df1.prefab b/assets/resources/game/heros/df1.prefab index 52ae7b03..a7843f3a 100644 --- a/assets/resources/game/heros/df1.prefab +++ b/assets/resources/game/heros/df1.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/df2.prefab b/assets/resources/game/heros/df2.prefab index 3eb98bf8..a22e8723 100644 --- a/assets/resources/game/heros/df2.prefab +++ b/assets/resources/game/heros/df2.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/df3.prefab b/assets/resources/game/heros/df3.prefab index f887026d..8de8233f 100644 --- a/assets/resources/game/heros/df3.prefab +++ b/assets/resources/game/heros/df3.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/ft1.prefab b/assets/resources/game/heros/ft1.prefab index 4fad7564..16438c15 100644 --- a/assets/resources/game/heros/ft1.prefab +++ b/assets/resources/game/heros/ft1.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/h1.prefab b/assets/resources/game/heros/h1.prefab index 7bf4d117..f3695c7c 100644 --- a/assets/resources/game/heros/h1.prefab +++ b/assets/resources/game/heros/h1.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/k1.prefab b/assets/resources/game/heros/k1.prefab index bf605420..f5b7b69a 100644 --- a/assets/resources/game/heros/k1.prefab +++ b/assets/resources/game/heros/k1.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 85 + "__id__": 75 } ], "_active": true, "_components": [ + { + "__id__": 84 + }, + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, { "__id__": 94 - }, - { - "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 } ], "_prefab": { - "__id__": 106 + "__id__": 96 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,19 +1123,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 }, { - "__id__": 84 + "__id__": 74 } ], "removedComponents": [] @@ -1289,7 +1143,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1305,7 +1159,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1320,7 +1174,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1336,7 +1190,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1351,7 +1205,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_active" @@ -1365,14 +1219,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 86 + "__id__": 76 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 85 + "__id__": 75 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1380,7 +1234,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 87 + "__id__": 77 }, "targetOverrides": null }, @@ -1394,19 +1248,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 88 + "__id__": 78 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 } ], "removedComponents": [] @@ -1414,7 +1268,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_name" @@ -1430,7 +1284,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_lpos" @@ -1445,7 +1299,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_lrot" @@ -1461,7 +1315,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_euler" @@ -1476,7 +1330,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 79 }, "propertyPath": [ "_active" @@ -1493,7 +1347,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 85 }, "_contentSize": { "__type__": "cc.Size", @@ -1521,7 +1375,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "enabledContactListener": true, "bullet": true, @@ -1555,7 +1409,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "tag": 0, "_group": 4, @@ -1589,7 +1443,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "anm": { "__id__": 22 @@ -1610,7 +1464,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "_id": "" }, @@ -1628,7 +1482,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1649,13 +1503,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 85 + "__id__": 75 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/k2.prefab b/assets/resources/game/heros/k2.prefab index 20ba6b76..4178667f 100644 --- a/assets/resources/game/heros/k2.prefab +++ b/assets/resources/game/heros/k2.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/k3.prefab b/assets/resources/game/heros/k3.prefab index 33696c63..15b1a019 100644 --- a/assets/resources/game/heros/k3.prefab +++ b/assets/resources/game/heros/k3.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/k4.prefab b/assets/resources/game/heros/k4.prefab index 3dbb85b9..c074455b 100644 --- a/assets/resources/game/heros/k4.prefab +++ b/assets/resources/game/heros/k4.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/k5.prefab b/assets/resources/game/heros/k5.prefab index 79979d20..11a72cc1 100644 --- a/assets/resources/game/heros/k5.prefab +++ b/assets/resources/game/heros/k5.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/k6.prefab b/assets/resources/game/heros/k6.prefab index e045dd94..aa6e44f3 100644 --- a/assets/resources/game/heros/k6.prefab +++ b/assets/resources/game/heros/k6.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/k7.prefab b/assets/resources/game/heros/k7.prefab index 04f081d5..fab22f7a 100644 --- a/assets/resources/game/heros/k7.prefab +++ b/assets/resources/game/heros/k7.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/m1.prefab b/assets/resources/game/heros/m1.prefab index 2579e4d6..753459d8 100644 --- a/assets/resources/game/heros/m1.prefab +++ b/assets/resources/game/heros/m1.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/m2.prefab b/assets/resources/game/heros/m2.prefab index 6034494c..c01cec8b 100644 --- a/assets/resources/game/heros/m2.prefab +++ b/assets/resources/game/heros/m2.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/m3.prefab b/assets/resources/game/heros/m3.prefab index e548b417..12d71c60 100644 --- a/assets/resources/game/heros/m3.prefab +++ b/assets/resources/game/heros/m3.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/m4.prefab b/assets/resources/game/heros/m4.prefab index 56f00677..d05eace1 100644 --- a/assets/resources/game/heros/m4.prefab +++ b/assets/resources/game/heros/m4.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/m5.prefab b/assets/resources/game/heros/m5.prefab index 5849ecd0..af63f47e 100644 --- a/assets/resources/game/heros/m5.prefab +++ b/assets/resources/game/heros/m5.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/m6.prefab b/assets/resources/game/heros/m6.prefab index e8b7fa73..52dbc084 100644 --- a/assets/resources/game/heros/m6.prefab +++ b/assets/resources/game/heros/m6.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/m7.prefab b/assets/resources/game/heros/m7.prefab index f4b1f20f..25a4f048 100644 --- a/assets/resources/game/heros/m7.prefab +++ b/assets/resources/game/heros/m7.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/m8.prefab b/assets/resources/game/heros/m8.prefab index 844cb680..072b90ba 100644 --- a/assets/resources/game/heros/m8.prefab +++ b/assets/resources/game/heros/m8.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/m9.prefab b/assets/resources/game/heros/m9.prefab index 91ca82c3..5156c1bc 100644 --- a/assets/resources/game/heros/m9.prefab +++ b/assets/resources/game/heros/m9.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/md1.prefab b/assets/resources/game/heros/md1.prefab index 3502c5d4..193b6686 100644 --- a/assets/resources/game/heros/md1.prefab +++ b/assets/resources/game/heros/md1.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/md2.prefab b/assets/resources/game/heros/md2.prefab index ee3cf094..3b6c89a2 100644 --- a/assets/resources/game/heros/md2.prefab +++ b/assets/resources/game/heros/md2.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/md3.prefab b/assets/resources/game/heros/md3.prefab index aa054123..f6297ae2 100644 --- a/assets/resources/game/heros/md3.prefab +++ b/assets/resources/game/heros/md3.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -470,7 +467,7 @@ "__uuid__": "1b24ff26-17c5-4f95-9056-5654ed40f136", "__expectedType__": "sp.SkeletonData" }, - "defaultSkin": "", + "defaultSkin": "default", "defaultAnimation": "", "_premultipliedAlpha": true, "_timeScale": 1, @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/md4.prefab b/assets/resources/game/heros/md4.prefab index 0a1bc0e9..3d53751d 100644 --- a/assets/resources/game/heros/md4.prefab +++ b/assets/resources/game/heros/md4.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mgem1.prefab b/assets/resources/game/heros/mgem1.prefab index fd1c3c28..4b83748f 100644 --- a/assets/resources/game/heros/mgem1.prefab +++ b/assets/resources/game/heros/mgem1.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mgem2.prefab b/assets/resources/game/heros/mgem2.prefab index 78baf8ac..3bfcb961 100644 --- a/assets/resources/game/heros/mgem2.prefab +++ b/assets/resources/game/heros/mgem2.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mgem3.prefab b/assets/resources/game/heros/mgem3.prefab index 7cdd40fa..502a7c33 100644 --- a/assets/resources/game/heros/mgem3.prefab +++ b/assets/resources/game/heros/mgem3.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mkl1.prefab b/assets/resources/game/heros/mkl1.prefab index 842ff353..e23b736f 100644 --- a/assets/resources/game/heros/mkl1.prefab +++ b/assets/resources/game/heros/mkl1.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mkl2.prefab b/assets/resources/game/heros/mkl2.prefab index 3f80d67b..6e60bcb9 100644 --- a/assets/resources/game/heros/mkl2.prefab +++ b/assets/resources/game/heros/mkl2.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mkl3.prefab b/assets/resources/game/heros/mkl3.prefab index bed485e9..df1647d2 100644 --- a/assets/resources/game/heros/mkl3.prefab +++ b/assets/resources/game/heros/mkl3.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mkl4.prefab b/assets/resources/game/heros/mkl4.prefab index 67554d4e..8bbfd74d 100644 --- a/assets/resources/game/heros/mkl4.prefab +++ b/assets/resources/game/heros/mkl4.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mkl5.prefab b/assets/resources/game/heros/mkl5.prefab index 75a7700a..693e6cb3 100644 --- a/assets/resources/game/heros/mkl5.prefab +++ b/assets/resources/game/heros/mkl5.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mkl6.prefab b/assets/resources/game/heros/mkl6.prefab index fd2846e8..5495dde8 100644 --- a/assets/resources/game/heros/mkl6.prefab +++ b/assets/resources/game/heros/mkl6.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mkla1.prefab b/assets/resources/game/heros/mkla1.prefab index b139c53c..17149bd0 100644 --- a/assets/resources/game/heros/mkla1.prefab +++ b/assets/resources/game/heros/mkla1.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mkla2.prefab b/assets/resources/game/heros/mkla2.prefab index c8e2f5ce..c180cc7d 100644 --- a/assets/resources/game/heros/mkla2.prefab +++ b/assets/resources/game/heros/mkla2.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mkla3.prefab b/assets/resources/game/heros/mkla3.prefab index d8d45be1..806e31c8 100644 --- a/assets/resources/game/heros/mkla3.prefab +++ b/assets/resources/game/heros/mkla3.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mn1.prefab b/assets/resources/game/heros/mn1.prefab index f48ce033..fc3c61ca 100644 --- a/assets/resources/game/heros/mn1.prefab +++ b/assets/resources/game/heros/mn1.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mn2.prefab b/assets/resources/game/heros/mn2.prefab index e7f3b8dc..06907059 100644 --- a/assets/resources/game/heros/mn2.prefab +++ b/assets/resources/game/heros/mn2.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mn3.prefab b/assets/resources/game/heros/mn3.prefab index 338e99fc..26f9c52b 100644 --- a/assets/resources/game/heros/mn3.prefab +++ b/assets/resources/game/heros/mn3.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mn4.prefab b/assets/resources/game/heros/mn4.prefab index 721e7b1d..f2386e74 100644 --- a/assets/resources/game/heros/mn4.prefab +++ b/assets/resources/game/heros/mn4.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mor1.prefab b/assets/resources/game/heros/mor1.prefab index 9e696d6b..2298ec9a 100644 --- a/assets/resources/game/heros/mor1.prefab +++ b/assets/resources/game/heros/mor1.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mor2.prefab b/assets/resources/game/heros/mor2.prefab index 306e2039..b948607a 100644 --- a/assets/resources/game/heros/mor2.prefab +++ b/assets/resources/game/heros/mor2.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mor3.prefab b/assets/resources/game/heros/mor3.prefab index d85fb060..e533da22 100644 --- a/assets/resources/game/heros/mor3.prefab +++ b/assets/resources/game/heros/mor3.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/mor4.prefab b/assets/resources/game/heros/mor4.prefab index a610a6cf..255622e7 100644 --- a/assets/resources/game/heros/mor4.prefab +++ b/assets/resources/game/heros/mor4.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/my1.prefab b/assets/resources/game/heros/my1.prefab index 7dbe9b87..2045a13b 100644 --- a/assets/resources/game/heros/my1.prefab +++ b/assets/resources/game/heros/my1.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/my2.prefab b/assets/resources/game/heros/my2.prefab index 0d951c91..d37b53f7 100644 --- a/assets/resources/game/heros/my2.prefab +++ b/assets/resources/game/heros/my2.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/my3.prefab b/assets/resources/game/heros/my3.prefab index 9edaea20..c4a862ef 100644 --- a/assets/resources/game/heros/my3.prefab +++ b/assets/resources/game/heros/my3.prefab @@ -40,38 +40,35 @@ "__id__": 57 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 76 - }, - { - "__id__": 84 + "__id__": 74 } ], "_active": true, "_components": [ + { + "__id__": 83 + }, + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + }, + { + "__id__": 91 + }, { "__id__": 93 - }, - { - "__id__": 95 - }, - { - "__id__": 97 - }, - { - "__id__": 99 - }, - { - "__id__": 101 - }, - { - "__id__": 103 } ], "_prefab": { - "__id__": 105 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -982,10 +979,10 @@ "__id__": 57 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 59 }, @@ -993,7 +990,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1014,9 +1011,6 @@ }, { "__id__": 65 - }, - { - "__id__": 66 } ], "removedComponents": [] @@ -1029,146 +1023,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 61 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 68 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 67 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 69 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 70 - }, - { - "__id__": 72 - }, - { - "__id__": 73 - }, - { - "__id__": 74 - }, - { - "__id__": 75 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 71 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1180,7 +1034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lpos" @@ -1195,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_lrot" @@ -1211,7 +1065,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_euler" @@ -1226,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 71 + "__id__": 61 }, "propertyPath": [ "_active" @@ -1240,14 +1094,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 77 + "__id__": 67 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 76 + "__id__": 66 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1255,7 +1109,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 78 + "__id__": 68 }, "targetOverrides": null }, @@ -1269,16 +1123,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 79 + "__id__": 69 }, { - "__id__": 81 + "__id__": 71 }, { - "__id__": 82 + "__id__": 72 }, { - "__id__": 83 + "__id__": 73 } ], "removedComponents": [] @@ -1286,7 +1140,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_name" @@ -1302,7 +1156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lpos" @@ -1317,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_lrot" @@ -1333,7 +1187,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 70 }, "propertyPath": [ "_euler" @@ -1352,14 +1206,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 85 + "__id__": 75 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 84 + "__id__": 74 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1367,7 +1221,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 86 + "__id__": 76 }, "targetOverrides": null }, @@ -1381,19 +1235,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 89 + "__id__": 79 }, { - "__id__": 90 + "__id__": 80 }, { - "__id__": 91 + "__id__": 81 }, { - "__id__": 92 + "__id__": 82 } ], "removedComponents": [] @@ -1401,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_name" @@ -1417,7 +1271,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lpos" @@ -1432,7 +1286,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_lrot" @@ -1448,7 +1302,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_euler" @@ -1463,7 +1317,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 78 }, "propertyPath": [ "_active" @@ -1480,7 +1334,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 84 }, "_contentSize": { "__type__": "cc.Size", @@ -1508,7 +1362,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1542,7 +1396,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "tag": 0, "_group": 4, @@ -1576,7 +1430,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "anm": { "__id__": 22 @@ -1597,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 92 }, "_id": "" }, @@ -1615,7 +1469,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 94 }, "_id": "" }, @@ -1636,13 +1490,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 84 + "__id__": 74 }, { - "__id__": 76 - }, - { - "__id__": 67 + "__id__": 66 }, { "__id__": 57 diff --git a/assets/resources/game/heros/zh1.prefab b/assets/resources/game/heros/zh1.prefab index a6ca875f..d1e89198 100644 --- a/assets/resources/game/heros/zh1.prefab +++ b/assets/resources/game/heros/zh1.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/heros/zh2.prefab b/assets/resources/game/heros/zh2.prefab index 0945ebed..13d9c325 100644 --- a/assets/resources/game/heros/zh2.prefab +++ b/assets/resources/game/heros/zh2.prefab @@ -40,38 +40,35 @@ "__id__": 60 }, { - "__id__": 70 + "__id__": 69 }, { - "__id__": 79 - }, - { - "__id__": 87 + "__id__": 77 } ], "_active": true, "_components": [ + { + "__id__": 86 + }, + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + }, + { + "__id__": 94 + }, { "__id__": 96 - }, - { - "__id__": 98 - }, - { - "__id__": 100 - }, - { - "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -1014,10 +1011,10 @@ "__id__": 60 }, "asset": { - "__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a", + "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", "__expectedType__": "cc.Prefab" }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "fileId": "91yoyAQGNDm5ziI7NUChZ+", "instance": { "__id__": 62 }, @@ -1025,7 +1022,7 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "17Ib8GFs5NLLujjvFcA2Mf", + "fileId": "08n1IzuupL3YNn2/tFvc8M", "prefabRootNode": { "__id__": 1 }, @@ -1046,9 +1043,6 @@ }, { "__id__": 68 - }, - { - "__id__": 69 } ], "removedComponents": [] @@ -1061,146 +1055,6 @@ "propertyPath": [ "_name" ], - "value": "heathed" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 7.711, - "y": 34.203, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 71 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 70 - }, - "asset": { - "__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338", - "__expectedType__": "cc.Prefab" - }, - "fileId": "91yoyAQGNDm5ziI7NUChZ+", - "instance": { - "__id__": 72 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "08n1IzuupL3YNn2/tFvc8M", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 73 - }, - { - "__id__": 75 - }, - { - "__id__": 76 - }, - { - "__id__": 77 - }, - { - "__id__": 78 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_name" - ], "value": "up" }, { @@ -1212,7 +1066,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lpos" @@ -1227,7 +1081,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_lrot" @@ -1243,7 +1097,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_euler" @@ -1258,7 +1112,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 64 }, "propertyPath": [ "_active" @@ -1272,14 +1126,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 80 + "__id__": 70 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 79 + "__id__": 69 }, "asset": { "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f", @@ -1287,7 +1141,7 @@ }, "fileId": "733PKzwANLyJWD2ume4u5f", "instance": { - "__id__": 81 + "__id__": 71 }, "targetOverrides": null }, @@ -1301,16 +1155,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 82 + "__id__": 72 }, { - "__id__": 84 + "__id__": 74 }, { - "__id__": 85 + "__id__": 75 }, { - "__id__": 86 + "__id__": 76 } ], "removedComponents": [] @@ -1318,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_name" @@ -1334,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lpos" @@ -1349,7 +1203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_lrot" @@ -1365,7 +1219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 83 + "__id__": 73 }, "propertyPath": [ "_euler" @@ -1384,14 +1238,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 88 + "__id__": 78 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 87 + "__id__": 77 }, "asset": { "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c", @@ -1399,7 +1253,7 @@ }, "fileId": "65v9q/98dMjafRlb094Ctr", "instance": { - "__id__": 89 + "__id__": 79 }, "targetOverrides": null }, @@ -1413,19 +1267,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 90 + "__id__": 80 }, { - "__id__": 92 + "__id__": 82 }, { - "__id__": 93 + "__id__": 83 }, { - "__id__": 94 + "__id__": 84 }, { - "__id__": 95 + "__id__": 85 } ], "removedComponents": [] @@ -1433,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_name" @@ -1449,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lpos" @@ -1464,7 +1318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_lrot" @@ -1480,7 +1334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_euler" @@ -1495,7 +1349,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1512,7 +1366,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -1540,7 +1394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 89 }, "enabledContactListener": true, "bullet": true, @@ -1574,7 +1428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 91 }, "tag": 0, "_group": 4, @@ -1608,7 +1462,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 93 }, "anm": { "__id__": 22 @@ -1629,7 +1483,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_id": "" }, @@ -1647,7 +1501,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_id": "" }, @@ -1668,13 +1522,10 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 87 + "__id__": 77 }, { - "__id__": 79 - }, - { - "__id__": 70 + "__id__": 69 }, { "__id__": 60 diff --git a/assets/resources/game/skills/heathed.prefab b/assets/resources/game/skills/heathed.prefab index 3c5b185a..9ad08462 100644 --- a/assets/resources/game/skills/heathed.prefab +++ b/assets/resources/game/skills/heathed.prefab @@ -87,7 +87,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -6.767, - "y": -40.599, + "y": 0, "z": 0 }, "_lrot": { diff --git a/assets/resources/game/skills/kingba.prefab b/assets/resources/game/skills/kingba.prefab index bf33ce47..eff563cf 100644 --- a/assets/resources/game/skills/kingba.prefab +++ b/assets/resources/game/skills/kingba.prefab @@ -38,13 +38,10 @@ }, { "__id__": 16 - }, - { - "__id__": 18 } ], "_prefab": { - "__id__": 20 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -343,24 +340,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "93yD/FzRtIw4y+dp2MAd1k" }, - { - "__type__": "f5c0acU9TtA5JBGObMPOZe3", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 19 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "66G9MkV3xJ0b5iZ8qo01HC" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/script/game/hero/BuffComp.ts b/assets/script/game/hero/BuffComp.ts index 1533953b..b6dd6110 100644 --- a/assets/script/game/hero/BuffComp.ts +++ b/assets/script/game/hero/BuffComp.ts @@ -174,7 +174,10 @@ export class BuffComp extends Component { tip.load(pos,type,value,s_uuid,this.node); } heathed(){ - this.node.getChildByName("heathed").active=true + var path = "game/skills/heathed"; + var prefab: Prefab = oops.res.get(path, Prefab)!; + var node = instantiate(prefab); + node.parent = this.node; } } diff --git a/assets/script/game/skills/AnmEndCom.ts b/assets/script/game/skills/AnmEndCom.ts index 19cb5470..a336e327 100644 --- a/assets/script/game/skills/AnmEndCom.ts +++ b/assets/script/game/skills/AnmEndCom.ts @@ -23,7 +23,7 @@ export class AnmEndCom extends Component { } } onAnimationFinished(){ - this.node.active=false + this.node.destroy() } }