diff --git a/assets/resources/game/heros/ha1.prefab b/assets/resources/game/heros/ha1.prefab index 5c13ac2e..6a9c9904 100644 --- a/assets/resources/game/heros/ha1.prefab +++ b/assets/resources/game/heros/ha1.prefab @@ -440,7 +440,7 @@ "propertyPath": [ "_active" ], - "value": true + "value": false }, { "__type__": "CCPropertyOverrideInfo", diff --git a/assets/resources/game/skill/anm/atk/atk02.anim b/assets/resources/game/skill/anm/atk/atk02.anim index 2f24a166..179d5701 100644 --- a/assets/resources/game/skill/anm/atk/atk02.anim +++ b/assets/resources/game/skill/anm/atk/atk02.anim @@ -7,11 +7,11 @@ "embeddedPlayerGroups": [] }, "_native": "", - "sample": 24, + "sample": 60, "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.25, + "_duration": 0.1, "_hash": 500763545, "_tracks": [ { @@ -21,12 +21,12 @@ "_exoticAnimation": null, "_events": [ { - "frame": 0.08333333333333333, + "frame": 0.05, "func": "", "params": [] }, { - "frame": 0.08333333333333333, + "frame": 0.05, "func": "atk", "params": [] } @@ -79,26 +79,11 @@ { "__type__": "cc.ObjectCurve", "_times": [ - 0, - 0.041666666666666664, - 0.08333333333333333, - 0.125, - 0.16666666666666666, - 0.20833333333333334 + 0.05, + 0.06666666666666667, + 0.08333333333333333 ], "_values": [ - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b1a7d", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@0cbf1", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@500e6", - "__expectedType__": "cc.SpriteFrame" - }, { "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@33fff", "__expectedType__": "cc.SpriteFrame" diff --git a/assets/resources/game/skill/anm/atk/atk05.anim b/assets/resources/game/skill/anm/atk/atk05.anim index 142d8482..f1fbb1eb 100644 --- a/assets/resources/game/skill/anm/atk/atk05.anim +++ b/assets/resources/game/skill/anm/atk/atk05.anim @@ -7,137 +7,21 @@ "embeddedPlayerGroups": [] }, "_native": "", - "sample": 24, + "sample": 12, "speed": 1, - "wrapMode": 1, + "wrapMode": 2, "enableTrsBlending": false, - "_duration": 0.4583333333333333, + "_duration": 0, "_hash": 500763545, - "_tracks": [ - { - "__id__": 1 - } - ], + "_tracks": [], "_exoticAnimation": null, - "_events": [ - { - "frame": 0.20833333333333334, - "func": "", - "params": [] - }, - { - "frame": 0.20833333333333334, - "func": "atk", - "params": [] - } - ], + "_events": [], "_embeddedPlayers": [], "_additiveSettings": { - "__id__": 7 + "__id__": 1 }, "_auxiliaryCurveEntries": [] }, - { - "__type__": "cc.animation.ObjectTrack", - "_binding": { - "__type__": "cc.animation.TrackBinding", - "path": { - "__id__": 2 - }, - "proxy": null - }, - "_channel": { - "__id__": 5 - } - }, - { - "__type__": "cc.animation.TrackPath", - "_paths": [ - { - "__id__": 3 - }, - { - "__id__": 4 - }, - "spriteFrame" - ] - }, - { - "__type__": "cc.animation.HierarchyPath", - "path": "Node" - }, - { - "__type__": "cc.animation.ComponentPath", - "component": "cc.Sprite" - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 6 - } - }, - { - "__type__": "cc.ObjectCurve", - "_times": [ - 0, - 0.041666666666666664, - 0.08333333333333333, - 0.125, - 0.16666666666666666, - 0.20833333333333334, - 0.25, - 0.2916666666666667, - 0.3333333333333333, - 0.375, - 0.4166666666666667 - ], - "_values": [ - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@30608", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b0b10", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@76298", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@76bd7", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@d4058", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@9197a", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@22801", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@76161", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@a8392", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@e2de4", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@d96ab", - "__expectedType__": "cc.SpriteFrame" - } - ] - }, { "__type__": "cc.AnimationClipAdditiveSettings", "enabled": false, diff --git a/assets/resources/game/skill/atk/atk.prefab b/assets/resources/game/skill/atk/atk.prefab index 2b9d377a..19123638 100644 --- a/assets/resources/game/skill/atk/atk.prefab +++ b/assets/resources/game/skill/atk/atk.prefab @@ -92,7 +92,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -24.538, + "x": -3.417, "y": 18.168, "z": 0 }, @@ -105,8 +105,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -2.5, - "y": 2.5, + "x": -1, + "y": 1.2, "z": 1 }, "_mobility": 0, @@ -138,7 +138,7 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 1, + "x": 0.5, "y": 0.5 }, "_id": "" @@ -183,7 +183,7 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23", + "__uuid__": "3d46f945-3f07-477e-a95a-b49557d552c6", "__expectedType__": "cc.SpriteAtlas" }, "_id": "" @@ -201,8 +201,6 @@ "__id__": 0 }, "fileId": "3arqAMBz1MvoXBzeDaL5M/", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/resources/game/skill/atk/atk_s2.prefab b/assets/resources/game/skill/atk/atk_s2.prefab index 32c6d1f3..dd109d10 100644 --- a/assets/resources/game/skill/atk/atk_s2.prefab +++ b/assets/resources/game/skill/atk/atk_s2.prefab @@ -98,21 +98,21 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -71.371, - "y": 46.797, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { "__type__": "cc.Quat", "x": 0, "y": 0, - "z": -0.3826834323650898, - "w": 0.9238795325112867 + "z": 0, + "w": 1 }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.6, - "y": 1.6, + "x": 1, + "y": 0.9, "z": 1 }, "_mobility": 0, @@ -121,7 +121,7 @@ "__type__": "cc.Vec3", "x": 0, "y": 0, - "z": -45 + "z": 0 }, "_id": "" },