diff --git a/assets/resources/game/heros/mo6.prefab b/assets/resources/game/heros/mo6.prefab index 91b07172..6bcb388a 100644 --- a/assets/resources/game/heros/mo6.prefab +++ b/assets/resources/game/heros/mo6.prefab @@ -37,23 +37,23 @@ "_active": true, "_components": [ { - "__id__": 54 + "__id__": 66 }, { - "__id__": 56 + "__id__": 68 }, { - "__id__": 58 + "__id__": 70 }, { - "__id__": 60 + "__id__": 72 }, { - "__id__": 62 + "__id__": 74 } ], "_prefab": { - "__id__": 64 + "__id__": 76 }, "_lpos": { "__type__": "cc.Vec3", @@ -337,7 +337,10 @@ "__prefab": { "__id__": 14 }, - "_customMaterial": null, + "_customMaterial": { + "__uuid__": "2fcd55a9-38ca-45aa-9164-68e48aaf51ce", + "__expectedType__": "cc.Material" + }, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -830,32 +833,202 @@ "prefabRootNode": { "__id__": 1 }, - "mountedChildren": [], + "mountedChildren": [ + { + "__id__": 48 + } + ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 48 + "__id__": 56 }, { - "__id__": 50 + "__id__": 58 }, { - "__id__": 51 + "__id__": 59 }, { - "__id__": 52 + "__id__": 60 }, { - "__id__": 53 + "__id__": 61 + }, + { + "__id__": 62 + }, + { + "__id__": 64 } ], "removedComponents": [] }, { - "__type__": "CCPropertyOverrideInfo", + "__type__": "cc.MountedChildrenInfo", "targetInfo": { "__id__": 49 }, + "nodes": [ + { + "__id__": 50 + } + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5fqU0L3/FOhKaco5UkHuWT" + ] + }, + { + "__type__": "cc.Node", + "_name": "ItemIcon_Skull_Boss_Red", + "_objFlags": 0, + "__editorExtras__": { + "mountedRoot": { + "__id__": 45 + } + }, + "_parent": { + "__id__": 45 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 51 + }, + { + "__id__": 53 + } + ], + "_prefab": { + "__id__": 55 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0.9007692307691286, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.09999999999999999, + "y": 0.09999999999999999, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 50 + }, + "_enabled": true, + "__prefab": { + "__id__": 52 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 126, + "height": 112 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c9TsqhE4hLzZrjpuZNqOno" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 50 + }, + "_enabled": true, + "__prefab": { + "__id__": 54 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@eb1e3", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "955O5G/ZpDzZMIefIeLnat" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "51mbNeFzBNjL08MItkj3IX", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 57 + }, "propertyPath": [ "_name" ], @@ -870,7 +1043,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 49 + "__id__": 57 }, "propertyPath": [ "_lpos" @@ -885,7 +1058,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 49 + "__id__": 57 }, "propertyPath": [ "_lrot" @@ -901,7 +1074,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 49 + "__id__": 57 }, "propertyPath": [ "_euler" @@ -916,18 +1089,61 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 49 + "__id__": 57 }, "propertyPath": [ "_lscale" ], "value": { "__type__": "cc.Vec3", - "x": 1.4, - "y": 1.4, + "x": 1.3, + "y": 1.3, "z": 1 } }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 63 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 255, + "g": 204, + "b": 0, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "42Iqibz0VOArXYqoFJhNMf" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 65 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "4bGUhFXlZF/Jdkcq0HY9ai" + ] + }, { "__type__": "cc.UITransform", "_name": "", @@ -938,7 +1154,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 67 }, "_contentSize": { "__type__": "cc.Size", @@ -966,7 +1182,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 69 }, "anm": { "__id__": 11 @@ -987,7 +1203,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 71 }, "debugMode": false, "_id": "" @@ -1006,7 +1222,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 73 }, "enabledContactListener": true, "bullet": false, @@ -1040,7 +1256,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 75 }, "tag": 0, "_group": 4, diff --git a/assets/resources/game/heros/mud4.prefab b/assets/resources/game/heros/mud4.prefab index 3fbd07dd..29af6519 100644 --- a/assets/resources/game/heros/mud4.prefab +++ b/assets/resources/game/heros/mud4.prefab @@ -29,10 +29,19 @@ }, { "__id__": 32 + }, + { + "__id__": 45 } ], "_active": true, "_components": [ + { + "__id__": 69 + }, + { + "__id__": 71 + }, { "__id__": 73 }, @@ -41,16 +50,10 @@ }, { "__id__": 77 - }, - { - "__id__": 79 - }, - { - "__id__": 81 } ], "_prefab": { - "__id__": 83 + "__id__": 79 }, "_lpos": { "__type__": "cc.Vec3", @@ -633,10 +636,10 @@ "__id__": 32 }, "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", + "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", "__expectedType__": "cc.Prefab" }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", + "fileId": "54R/aYBglLI4Jn5pm++Jx8", "instance": { "__id__": 34 }, @@ -644,67 +647,225 @@ }, { "__type__": "cc.PrefabInstance", - "fileId": "f4ModMncVDMrUHuqBiagGP", + "fileId": "6eEf1iw+VOYqP0C94fVBmY", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 35 + }, + { + "__id__": 37 + }, + { + "__id__": 38 + }, + { + "__id__": 39 + }, + { + "__id__": 40 + }, + { + "__id__": 41 + }, + { + "__id__": 43 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 36 + }, + "propertyPath": [ + "_name" + ], + "value": "plus" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "54R/aYBglLI4Jn5pm++Jx8" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 36 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": -3.73, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 36 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 36 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 36 + }, + "propertyPath": [ + "_lscale" + ], + "value": { + "__type__": "cc.Vec3", + "x": 1.4, + "y": 1.4, + "z": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 42 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 255, + "g": 0, + "b": 0, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "7fFzhENiBDf5TeBL7e/kJ+", + "9a+65VIghBm4HQxuHPQ/mg" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 44 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 255, + "g": 0, + "b": 0, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "73Bl2rptBKGr6i8cMQId1k", + "a5MYbJnJVJx4g7hgv8+4Vv" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 46 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 45 + }, + "asset": { + "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", + "__expectedType__": "cc.Prefab" + }, + "fileId": "5fqU0L3/FOhKaco5UkHuWT", + "instance": { + "__id__": 47 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "2246jD+21K84zKG6dpKPCX", "prefabRootNode": { "__id__": 1 }, "mountedChildren": [ { - "__id__": 35 + "__id__": 48 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 43 + "__id__": 56 }, { - "__id__": 45 - }, - { - "__id__": 46 - }, - { - "__id__": 47 - }, - { - "__id__": 48 - }, - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 53 - }, - { - "__id__": 55 - }, - { - "__id__": 57 + "__id__": 58 }, { "__id__": 59 }, + { + "__id__": 60 + }, { "__id__": 61 }, { - "__id__": 63 + "__id__": 62 }, { - "__id__": 65 + "__id__": 64 }, { - "__id__": 67 + "__id__": 66 }, { - "__id__": 69 - }, - { - "__id__": 71 + "__id__": 68 } ], "removedComponents": [] @@ -712,11 +873,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 36 + "__id__": 49 }, "nodes": [ { - "__id__": 37 + "__id__": 50 } ] }, @@ -728,33 +889,33 @@ }, { "__type__": "cc.Node", - "_name": "UI_Play_Skull_01", + "_name": "ItemIcon_Skull_Boss_Red", "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 32 + "__id__": 45 } }, "_parent": { - "__id__": 32 + "__id__": 45 }, "_children": [], "_active": true, "_components": [ { - "__id__": 38 + "__id__": 51 }, { - "__id__": 40 + "__id__": 53 } ], "_prefab": { - "__id__": 42 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 27.672, + "y": 10.812, "z": 0 }, "_lrot": { @@ -766,8 +927,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.4, - "y": 0.4, + "x": 0.09999999999999999, + "y": 0.09999999999999999, "z": 1 }, "_mobility": 0, @@ -786,16 +947,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 52 }, "_contentSize": { "__type__": "cc.Size", "width": 126, - "height": 98 + "height": 112 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -806,7 +967,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "21nuE9AOdJyZLOT8zAS8rB" + "fileId": "c9TsqhE4hLzZrjpuZNqOno" }, { "__type__": "cc.Sprite", @@ -814,11 +975,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 54 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -831,7 +992,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@6f366", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@eb1e3", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -846,12 +1007,15 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "94tEZ7yJtHPIcGXAdoMd13" + "fileId": "955O5G/ZpDzZMIefIeLnat" }, { "__type__": "cc.PrefabInfo", @@ -861,7 +1025,7 @@ "asset": { "__id__": 0 }, - "fileId": "10Q5sMPLZM/5G6SM6nQiP+", + "fileId": "51mbNeFzBNjL08MItkj3IX", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -869,7 +1033,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 44 + "__id__": 57 }, "propertyPath": [ "_name" @@ -885,7 +1049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 44 + "__id__": 57 }, "propertyPath": [ "_lpos" @@ -893,14 +1057,14 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 204.339, + "y": 105, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 44 + "__id__": 57 }, "propertyPath": [ "_lrot" @@ -916,7 +1080,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 44 + "__id__": 57 }, "propertyPath": [ "_euler" @@ -931,204 +1095,65 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 44 + "__id__": 57 }, "propertyPath": [ "_lscale" ], "value": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 1.3, + "y": 1.3, "z": 1 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 63 }, "propertyPath": [ - "_contentSize" + "_color" ], "value": { - "__type__": "cc.Size", - "width": 100, - "height": 15 + "__type__": "cc.Color", + "r": 255, + "g": 204, + "b": 0, + "a": 255 } }, { "__type__": "cc.TargetInfo", "localID": [ - "01jesPhj9CEZDz66U5IkN4" + "42Iqibz0VOArXYqoFJhNMf" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 52 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 100, - "height": 15 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "73XD/xCtdN56MXQv4d3Zpr" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 54 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 100, - "height": 15 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "6eLgGcjghBaJCJdqSzqDJp" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 56 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 100, - "height": 15 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "47UQtk5rhPMK9KaOrIeeUz" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 58 + "__id__": 65 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": -50, - "y": 0, + "x": 0, + "y": 9.911, "z": 0 } }, { "__type__": "cc.TargetInfo", "localID": [ - "03VJ/IU/tHh6ufeq0Tr5KW" + "4bGUhFXlZF/Jdkcq0HY9ai" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 60 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 56.66666666666667 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "48dZn31pVBZIHXQOp8UtqL" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 62 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 100, - "height": 15 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "7f9LGtOY9DM6ZTL5+fc4gA" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -50, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "61x78YGExIH5sbDV+PvuuK" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 66 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 56.66666666666667 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c7Cwn33JNAvp+kuH9WDEb+" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 68 + "__id__": 67 }, "propertyPath": [ "_active" @@ -1144,44 +1169,18 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 70 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 100, - "height": 15 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "57EU4BJPlAgpvAWLFbIF5T" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 72 + "__id__": 67 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": -50, + "x": 0, "y": 0, "z": 0 } }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "2cGho1ykJKfpUTHn50V/AJ" - ] - }, { "__type__": "cc.UITransform", "_name": "", @@ -1192,7 +1191,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 70 }, "_contentSize": { "__type__": "cc.Size", @@ -1220,7 +1219,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 72 }, "anm": { "__id__": 11 @@ -1241,7 +1240,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 74 }, "debugMode": false, "_id": "" @@ -1260,7 +1259,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 76 }, "enabledContactListener": true, "bullet": false, @@ -1294,7 +1293,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 78 }, "tag": 0, "_group": 4, @@ -1330,6 +1329,9 @@ "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": [ + { + "__id__": 45 + }, { "__id__": 32 }, diff --git a/assets/resources/game/heros/mud5.prefab b/assets/resources/game/heros/mud5.prefab index fd69ff41..e6ba0fdb 100644 --- a/assets/resources/game/heros/mud5.prefab +++ b/assets/resources/game/heros/mud5.prefab @@ -22,35 +22,35 @@ "__id__": 2 }, { - "__id__": 8 + "__id__": 14 }, { - "__id__": 20 + "__id__": 26 }, { - "__id__": 32 + "__id__": 39 } ], "_active": true, "_components": [ { - "__id__": 75 + "__id__": 60 }, { - "__id__": 77 + "__id__": 62 }, { - "__id__": 79 + "__id__": 64 }, { - "__id__": 81 + "__id__": 66 }, { - "__id__": 83 + "__id__": 68 } ], "_prefab": { - "__id__": 85 + "__id__": 70 }, "_lpos": { "__type__": "cc.Vec3", @@ -83,7 +83,7 @@ }, { "__type__": "cc.Node", - "_name": "shadow", + "_name": "anm", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -97,155 +97,19 @@ }, { "__id__": 5 - } - ], - "_prefab": { - "__id__": 7 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 4.897, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 0.8, - "z": 1 - }, - "_mobility": 0, - "_layer": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 4 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 85, - "height": 12 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "25gg26tp5AnrIlzpnHzsFZ" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 211 - }, - "_spriteFrame": { - "__uuid__": "18ee504b-57e8-4e91-b3ac-a08c43c94b3d@34d88", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1foLiQ3dtNFYL5BLcZYVri" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "79Iy4XHulAJ54/rbadrSiJ", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "anm", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ + }, + { + "__id__": 7 + }, { "__id__": 9 }, { "__id__": 11 - }, - { - "__id__": 13 - }, - { - "__id__": 15 - }, - { - "__id__": 17 } ], "_prefab": { - "__id__": 19 + "__id__": 13 }, "_lpos": { "__type__": "cc.Vec3", @@ -282,11 +146,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 10 + "__id__": 4 }, "_contentSize": { "__type__": "cc.Size", @@ -310,11 +174,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 6 }, "_id": "" }, @@ -328,11 +192,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 8 }, "_customMaterial": { "__uuid__": "2fcd55a9-38ca-45aa-9164-68e48aaf51ce", @@ -379,11 +243,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 16 + "__id__": 10 }, "playOnLoad": true, "_clips": [ @@ -421,11 +285,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 18 + "__id__": 12 }, "hitFlashMaterial": { "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", @@ -457,14 +321,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 21 + "__id__": 15 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 20 + "__id__": 14 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -472,7 +336,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 22 + "__id__": 16 }, "targetOverrides": null }, @@ -485,26 +349,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 17 + }, + { + "__id__": 19 + }, + { + "__id__": 20 + }, + { + "__id__": 21 + }, + { + "__id__": 22 + }, { "__id__": 23 }, { "__id__": 25 - }, - { - "__id__": 26 - }, - { - "__id__": 27 - }, - { - "__id__": 28 - }, - { - "__id__": 29 - }, - { - "__id__": 31 } ], "removedComponents": [] @@ -512,7 +376,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 18 }, "propertyPath": [ "_name" @@ -528,7 +392,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 18 }, "propertyPath": [ "_lpos" @@ -543,7 +407,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 18 }, "propertyPath": [ "_lrot" @@ -559,7 +423,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 18 }, "propertyPath": [ "_euler" @@ -574,7 +438,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 18 }, "propertyPath": [ "_active" @@ -584,7 +448,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 24 }, "propertyPath": [ "_contentSize" @@ -604,7 +468,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 18 }, "propertyPath": [ "_lscale" @@ -623,14 +487,196 @@ "__id__": 1 }, "_prefab": { - "__id__": 33 + "__id__": 27 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 32 + "__id__": 26 + }, + "asset": { + "__uuid__": "02e38f62-860e-4bb9-86d9-a59f073e2881", + "__expectedType__": "cc.Prefab" + }, + "fileId": "54R/aYBglLI4Jn5pm++Jx8", + "instance": { + "__id__": 28 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "01w1RiKnlNaq+4UeqBz0nN", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 29 + }, + { + "__id__": 31 + }, + { + "__id__": 32 + }, + { + "__id__": 33 + }, + { + "__id__": 34 + }, + { + "__id__": 35 + }, + { + "__id__": 37 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 30 + }, + "propertyPath": [ + "_name" + ], + "value": "plus" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "54R/aYBglLI4Jn5pm++Jx8" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 30 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": -3.73, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 30 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 30 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 30 + }, + "propertyPath": [ + "_lscale" + ], + "value": { + "__type__": "cc.Vec3", + "x": 1.6, + "y": 1.6, + "z": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 36 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 255, + "g": 0, + "b": 0, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "7fFzhENiBDf5TeBL7e/kJ+", + "9a+65VIghBm4HQxuHPQ/mg" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 38 + }, + "propertyPath": [ + "_color" + ], + "value": { + "__type__": "cc.Color", + "r": 255, + "g": 0, + "b": 0, + "a": 255 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "73Bl2rptBKGr6i8cMQId1k", + "a5MYbJnJVJx4g7hgv8+4Vv" + ] + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 40 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 39 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -638,76 +684,43 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 34 + "__id__": 41 }, "targetOverrides": null }, { "__type__": "cc.PrefabInstance", - "fileId": "f4ModMncVDMrUHuqBiagGP", + "fileId": "19NyGzFWhF6bH2LOsj/gPD", "prefabRootNode": { "__id__": 1 }, "mountedChildren": [ { - "__id__": 35 + "__id__": 42 } ], "mountedComponents": [], "propertyOverrides": [ { - "__id__": 43 + "__id__": 50 }, { - "__id__": 45 - }, - { - "__id__": 46 - }, - { - "__id__": 47 - }, - { - "__id__": 48 - }, - { - "__id__": 49 - }, - { - "__id__": 51 + "__id__": 52 }, { "__id__": 53 }, + { + "__id__": 54 + }, { "__id__": 55 }, { - "__id__": 57 + "__id__": 56 }, { - "__id__": 59 - }, - { - "__id__": 61 - }, - { - "__id__": 63 - }, - { - "__id__": 65 - }, - { - "__id__": 67 - }, - { - "__id__": 69 - }, - { - "__id__": 71 - }, - { - "__id__": 73 + "__id__": 58 } ], "removedComponents": [] @@ -715,11 +728,11 @@ { "__type__": "cc.MountedChildrenInfo", "targetInfo": { - "__id__": 36 + "__id__": 43 }, "nodes": [ { - "__id__": 37 + "__id__": 44 } ] }, @@ -731,33 +744,33 @@ }, { "__type__": "cc.Node", - "_name": "UI_Play_Skull_04", + "_name": "ItemIcon_Skull_Boss_Red", "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 32 + "__id__": 39 } }, "_parent": { - "__id__": 32 + "__id__": 39 }, "_children": [], "_active": true, "_components": [ { - "__id__": 38 + "__id__": 45 }, { - "__id__": 40 + "__id__": 47 } ], "_prefab": { - "__id__": 42 + "__id__": 49 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 24.52, + "y": 14.575, "z": 0 }, "_lrot": { @@ -769,8 +782,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.4, - "y": 0.4, + "x": 0.09999999999999999, + "y": 0.09999999999999999, "z": 1 }, "_mobility": 0, @@ -789,16 +802,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 44 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 46 }, "_contentSize": { "__type__": "cc.Size", "width": 126, - "height": 98 + "height": 112 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -809,7 +822,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "fawglKLgNETZ3J+V9eJMhk" + "fileId": "c9TsqhE4hLzZrjpuZNqOno" }, { "__type__": "cc.Sprite", @@ -817,11 +830,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 44 }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 48 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -834,7 +847,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@6f366", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@eb1e3", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -850,14 +863,14 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1fxRVB57RHVrq2s1ggD44M" + "fileId": "955O5G/ZpDzZMIefIeLnat" }, { "__type__": "cc.PrefabInfo", @@ -867,7 +880,7 @@ "asset": { "__id__": 0 }, - "fileId": "20spuNqqlIvJKWCI26S81M", + "fileId": "51mbNeFzBNjL08MItkj3IX", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -875,7 +888,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 44 + "__id__": 51 }, "propertyPath": [ "_name" @@ -891,7 +904,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 44 + "__id__": 51 }, "propertyPath": [ "_lpos" @@ -899,14 +912,14 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": 183.132, + "y": 105, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 44 + "__id__": 51 }, "propertyPath": [ "_lrot" @@ -922,7 +935,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 44 + "__id__": 51 }, "propertyPath": [ "_euler" @@ -937,276 +950,59 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 44 + "__id__": 51 }, "propertyPath": [ "_lscale" ], "value": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 1.3, + "y": 1.3, "z": 1 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 50 + "__id__": 57 }, "propertyPath": [ - "_contentSize" + "_color" ], "value": { - "__type__": "cc.Size", - "width": 100, - "height": 10 + "__type__": "cc.Color", + "r": 255, + "g": 204, + "b": 0, + "a": 255 } }, { "__type__": "cc.TargetInfo", "localID": [ - "73XD/xCtdN56MXQv4d3Zpr" + "42Iqibz0VOArXYqoFJhNMf" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 52 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 100, - "height": 10 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "7f9LGtOY9DM6ZTL5+fc4gA" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 54 + "__id__": 59 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": -50, - "y": 0, + "x": 0, + "y": 13.675, "z": 0 } }, { "__type__": "cc.TargetInfo", "localID": [ - "61x78YGExIH5sbDV+PvuuK" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 56 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 40 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c7Cwn33JNAvp+kuH9WDEb+" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 58 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 100, - "height": 10 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "01jesPhj9CEZDz66U5IkN4" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 60 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 100, - "height": 10 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "6eLgGcjghBaJCJdqSzqDJp" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 62 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 100, - "height": 10 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "47UQtk5rhPMK9KaOrIeeUz" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 64 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -50, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "03VJ/IU/tHh6ufeq0Tr5KW" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 66 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 340, - "height": 40 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "48dZn31pVBZIHXQOp8UtqL" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 68 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 75, - "height": 15 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "49eTrIJPpJI5XTfGC9FY32" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 70 - }, - "propertyPath": [ - "_spacingX" - ], - "value": 15 - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "87V4H05jlOQ6SoKtiY02Cr" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 72 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -30, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "71Em0LB4dL27DqYQ9OkFiQ" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 74 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 30, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "70CJhUD51O/Yn7lWbJeuyp" + "4bGUhFXlZF/Jdkcq0HY9ai" ] }, { @@ -1219,7 +1015,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 61 }, "_contentSize": { "__type__": "cc.Size", @@ -1247,10 +1043,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 63 }, "anm": { - "__id__": 11 + "__id__": 5 }, "_id": "" }, @@ -1268,7 +1064,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 65 }, "debugMode": false, "_id": "" @@ -1287,7 +1083,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 67 }, "enabledContactListener": true, "bullet": false, @@ -1321,7 +1117,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 69 }, "tag": 0, "_group": 4, @@ -1358,10 +1154,13 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 32 + "__id__": 39 }, { - "__id__": 20 + "__id__": 26 + }, + { + "__id__": 14 } ] } diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 9f05e42c..893b9eda 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -115,6 +115,7 @@ export class HeroViewComp extends CCComp { this.top_node = this.node.getChildByName("top"); this.topOpacity = this.top_node.getComponent(UIOpacity) || this.top_node.addComponent(UIOpacity); this.top_node.setPosition(0, 80, 0); + if(this.model.is_boss) this.top_node.setPosition(0, 105, 0); this.topBasePos = this.top_node.position.clone(); const hpNode = this.top_node.getChildByName("hp"); if(this.model.fac==FacSet.HERO){