diff --git a/assets/resources/game/skill/anm/atk/atk02.anim b/assets/resources/game/skill/anm/atk/atk02.anim index b74e0b38..b96e2a4d 100644 --- a/assets/resources/game/skill/anm/atk/atk02.anim +++ b/assets/resources/game/skill/anm/atk/atk02.anim @@ -11,29 +11,32 @@ "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.6, + "_duration": 0.65, "_hash": 500763545, "_tracks": [ { "__id__": 1 + }, + { + "__id__": 7 } ], "_exoticAnimation": null, "_events": [ { - "frame": 0.2, + "frame": 0.3, "func": "", "params": [] }, { - "frame": 0.2, + "frame": 0.3, "func": "atk", "params": [] } ], "_embeddedPlayers": [], "_additiveSettings": { - "__id__": 7 + "__id__": 13 }, "_auxiliaryCurveEntries": [] }, @@ -90,7 +93,8 @@ 0.4, 0.45, 0.5, - 0.55 + 0.55, + 0.6 ], "_values": [ { @@ -140,7 +144,98 @@ { "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@5d13a", "__expectedType__": "cc.SpriteFrame" - } + }, + null + ] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 8 + }, + "proxy": null + }, + "_channel": { + "__id__": 11 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 9 + }, + { + "__id__": 10 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "slash-horizontal1" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 12 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0.15, + 0.2, + 0.25, + 0.3, + 0.35, + 0.4, + 0.45, + 0.5, + 0.55, + 0.6 + ], + "_values": [ + null, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@d5755", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@d5755", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@34609", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@35b2b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@0e377", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@cb59a", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@5adf0", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@6c6f6", + "__expectedType__": "cc.SpriteFrame" + }, + null ] }, { diff --git a/assets/resources/game/skill/anm/atk/atk03.anim b/assets/resources/game/skill/anm/atk/atk03.anim index b68b8405..8d8dbb01 100644 --- a/assets/resources/game/skill/anm/atk/atk03.anim +++ b/assets/resources/game/skill/anm/atk/atk03.anim @@ -11,29 +11,32 @@ "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.4583333333333333, + "_duration": 0.5833333333333334, "_hash": 500763545, "_tracks": [ { "__id__": 1 + }, + { + "__id__": 7 } ], "_exoticAnimation": null, "_events": [ { - "frame": 0.08333333333333333, + "frame": 0.16666666666666666, "func": "", "params": [] }, { - "frame": 0.08333333333333333, + "frame": 0.16666666666666666, "func": "atk", "params": [] } ], "_embeddedPlayers": [], "_additiveSettings": { - "__id__": 7 + "__id__": 13 }, "_auxiliaryCurveEntries": [] }, @@ -89,7 +92,8 @@ 0.2916666666666667, 0.3333333333333333, 0.375, - 0.4166666666666667 + 0.4166666666666667, + 0.4583333333333333 ], "_values": [ { @@ -135,7 +139,95 @@ { "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@21b99", "__expectedType__": "cc.SpriteFrame" - } + }, + null + ] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 8 + }, + "proxy": null + }, + "_channel": { + "__id__": 11 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 9 + }, + { + "__id__": 10 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "slash-horizontal1" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 12 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.20833333333333334, + 0.25, + 0.2916666666666667, + 0.3333333333333333, + 0.375, + 0.4166666666666667, + 0.4583333333333333, + 0.5, + 0.5416666666666666 + ], + "_values": [ + null, + null, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@d5755", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@34609", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@35b2b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@0e377", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@cb59a", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@5adf0", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@6c6f6", + "__expectedType__": "cc.SpriteFrame" + }, + null ] }, { diff --git a/assets/resources/game/skill/anm/atk/atk05.anim b/assets/resources/game/skill/anm/atk/atk05.anim index bb7bbbbf..a9c12853 100644 --- a/assets/resources/game/skill/anm/atk/atk05.anim +++ b/assets/resources/game/skill/anm/atk/atk05.anim @@ -11,29 +11,32 @@ "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.4166666666666667, + "_duration": 0.7083333333333334, "_hash": 500763545, "_tracks": [ { "__id__": 1 + }, + { + "__id__": 7 } ], "_exoticAnimation": null, "_events": [ { - "frame": 0.08333333333333333, + "frame": 0.16666666666666666, "func": "", "params": [] }, { - "frame": 0.08333333333333333, + "frame": 0.16666666666666666, "func": "atk", "params": [] } ], "_embeddedPlayers": [], "_additiveSettings": { - "__id__": 7 + "__id__": 13 }, "_auxiliaryCurveEntries": [] }, @@ -88,7 +91,8 @@ 0.25, 0.2916666666666667, 0.3333333333333333, - 0.375 + 0.375, + 0.4166666666666667 ], "_values": [ { @@ -130,7 +134,115 @@ { "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@daa57", "__expectedType__": "cc.SpriteFrame" - } + }, + null + ] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 8 + }, + "proxy": null + }, + "_channel": { + "__id__": 11 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 9 + }, + { + "__id__": 10 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "fire-slash-horizontal1" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 12 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.16666666666666666, + 0.20833333333333334, + 0.25, + 0.2916666666666667, + 0.3333333333333333, + 0.375, + 0.4166666666666667, + 0.4583333333333333, + 0.5, + 0.5416666666666666, + 0.5833333333333334, + 0.625, + 0.6666666666666666 + ], + "_values": [ + null, + null, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@38937", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@31859", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@33f97", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@0ff1b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@4953c", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@cb80d", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@d0b5c", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@4ce52", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@90cfe", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@17d94", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@64baf", + "__expectedType__": "cc.SpriteFrame" + }, + null ] }, { diff --git a/assets/resources/game/skill/anm/atk/atk06.anim b/assets/resources/game/skill/anm/atk/atk06.anim index 75ccc937..70959d16 100644 --- a/assets/resources/game/skill/anm/atk/atk06.anim +++ b/assets/resources/game/skill/anm/atk/atk06.anim @@ -11,39 +11,32 @@ "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.625, + "_duration": 0.75, "_hash": 500763545, "_tracks": [ { "__id__": 1 + }, + { + "__id__": 7 } ], "_exoticAnimation": null, "_events": [ { - "frame": 0.20833333333333334, + "frame": 0.375, "func": "", "params": [] }, { - "frame": 0.20833333333333334, - "func": "atk", - "params": [] - }, - { - "frame": 0.4583333333333333, - "func": "", - "params": [] - }, - { - "frame": 0.4583333333333333, + "frame": 0.375, "func": "atk", "params": [] } ], "_embeddedPlayers": [], "_additiveSettings": { - "__id__": 7 + "__id__": 13 }, "_auxiliaryCurveEntries": [] }, @@ -103,7 +96,8 @@ 0.4583333333333333, 0.5, 0.5416666666666666, - 0.5833333333333334 + 0.5833333333333334, + 0.625 ], "_values": [ { @@ -165,7 +159,115 @@ { "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@1b470", "__expectedType__": "cc.SpriteFrame" - } + }, + null + ] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 8 + }, + "proxy": null + }, + "_channel": { + "__id__": 11 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 9 + }, + { + "__id__": 10 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "electric-slash-horizontal1" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 12 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.20833333333333334, + 0.25, + 0.2916666666666667, + 0.3333333333333333, + 0.375, + 0.4166666666666667, + 0.4583333333333333, + 0.5, + 0.5416666666666666, + 0.5833333333333334, + 0.625, + 0.6666666666666666, + 0.7083333333333334 + ], + "_values": [ + null, + null, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@f6490", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@6c874", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@5b5e5", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@5cc03", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@161b8", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@01fef", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@70d19", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@34499", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@9ec10", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@9e7f6", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@99406", + "__expectedType__": "cc.SpriteFrame" + }, + null ] }, { diff --git a/assets/resources/game/skill/atk/atk2.prefab b/assets/resources/game/skill/atk/atk2.prefab index 6a61c331..9e763e64 100644 --- a/assets/resources/game/skill/atk/atk2.prefab +++ b/assets/resources/game/skill/atk/atk2.prefab @@ -20,28 +20,31 @@ "_children": [ { "__id__": 2 + }, + { + "__id__": 8 } ], "_active": true, "_components": [ - { - "__id__": 8 - }, - { - "__id__": 10 - }, - { - "__id__": 12 - }, { "__id__": 14 }, { "__id__": 16 + }, + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 } ], "_prefab": { - "__id__": 18 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -211,6 +214,139 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "slash-horizontal1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 11 + } + ], + "_prefab": { + "__id__": 13 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 2, + "y": 2, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 95, + "height": 48 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0aybWnCBJDBb3WOXwo/YxC" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_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": "45iYWOPyBCNKkmXE+dmADF" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "bdI0RFo3VCNKhgFojxldzA", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -221,7 +357,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 9 + "__id__": 15 }, "_contentSize": { "__type__": "cc.Size", @@ -249,7 +385,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 17 }, "atk_x": 20, "atk_y": 40, @@ -261,6 +397,10 @@ "forceStartX": -1, "forceStartY": -1, "summon_count": 1, + "summon_target_mode": 0, + "summon_x_offset": 0, + "summon_y_offset": 0, + "summon_interval": 0, "height_offset": 0, "_id": "" }, @@ -278,7 +418,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 19 }, "enabledContactListener": true, "bullet": false, @@ -312,7 +452,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 21 }, "tag": 0, "_group": 1, @@ -346,7 +486,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 23 }, "playOnLoad": true, "_clips": [ diff --git a/assets/resources/game/skill/atk/atk3.prefab b/assets/resources/game/skill/atk/atk3.prefab index 18083810..69a8b326 100644 --- a/assets/resources/game/skill/atk/atk3.prefab +++ b/assets/resources/game/skill/atk/atk3.prefab @@ -20,28 +20,31 @@ "_children": [ { "__id__": 2 + }, + { + "__id__": 8 } ], "_active": true, "_components": [ - { - "__id__": 8 - }, - { - "__id__": 10 - }, - { - "__id__": 12 - }, { "__id__": 14 }, { "__id__": 16 + }, + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 } ], "_prefab": { - "__id__": 18 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -211,6 +214,139 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "slash-horizontal1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 11 + } + ], + "_prefab": { + "__id__": 13 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 2, + "y": 2, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 95, + "height": 48 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "82TGDP+iVBv4P1whT99OBW" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_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": "daC3XwzZFG4JHd5pqsR70r" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "e8yfxZXCJCU6wnX0/ttDjH", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -221,7 +357,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 9 + "__id__": 15 }, "_contentSize": { "__type__": "cc.Size", @@ -249,7 +385,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 17 }, "atk_x": 20, "atk_y": 40, @@ -261,6 +397,10 @@ "forceStartX": -1, "forceStartY": -1, "summon_count": 1, + "summon_target_mode": 0, + "summon_x_offset": 0, + "summon_y_offset": 0, + "summon_interval": 0, "height_offset": 0, "_id": "" }, @@ -278,7 +418,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 19 }, "enabledContactListener": true, "bullet": false, @@ -312,7 +452,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 21 }, "tag": 0, "_group": 1, @@ -346,7 +486,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 23 }, "playOnLoad": true, "_clips": [ diff --git a/assets/resources/game/skill/atk/atk5.prefab b/assets/resources/game/skill/atk/atk5.prefab index 8bbd442e..3344c91e 100644 --- a/assets/resources/game/skill/atk/atk5.prefab +++ b/assets/resources/game/skill/atk/atk5.prefab @@ -20,28 +20,31 @@ "_children": [ { "__id__": 2 + }, + { + "__id__": 8 } ], "_active": true, "_components": [ - { - "__id__": 8 - }, - { - "__id__": 10 - }, - { - "__id__": 12 - }, { "__id__": 14 }, { "__id__": 16 + }, + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 } ], "_prefab": { - "__id__": 18 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -173,7 +176,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@13b06", + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@7e6d7", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -211,6 +214,139 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "fire-slash-horizontal1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 11 + } + ], + "_prefab": { + "__id__": 13 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 29.777, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 2, + "y": 2, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 95, + "height": 48 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "61GNVJPatIJoTFQpCuL1tc" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_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": "64tuHxFsxBMK3c6Rl+GQll" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "05Mo/yQRtK5YAX1chbWL76", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -221,7 +357,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 9 + "__id__": 15 }, "_contentSize": { "__type__": "cc.Size", @@ -249,7 +385,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 17 }, "atk_x": 20, "atk_y": 40, @@ -261,6 +397,10 @@ "forceStartX": -1, "forceStartY": -1, "summon_count": 1, + "summon_target_mode": 0, + "summon_x_offset": 0, + "summon_y_offset": 0, + "summon_interval": 0, "height_offset": 0, "_id": "" }, @@ -278,7 +418,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 19 }, "enabledContactListener": true, "bullet": false, @@ -312,7 +452,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 21 }, "tag": 0, "_group": 1, @@ -346,7 +486,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 23 }, "playOnLoad": true, "_clips": [ diff --git a/assets/resources/game/skill/atk/atk6.prefab b/assets/resources/game/skill/atk/atk6.prefab index c6c0e298..bc7d32da 100644 --- a/assets/resources/game/skill/atk/atk6.prefab +++ b/assets/resources/game/skill/atk/atk6.prefab @@ -20,28 +20,31 @@ "_children": [ { "__id__": 2 + }, + { + "__id__": 8 } ], "_active": true, "_components": [ - { - "__id__": 8 - }, - { - "__id__": 10 - }, - { - "__id__": 12 - }, { "__id__": 14 }, { "__id__": 16 + }, + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 } ], "_prefab": { - "__id__": 18 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -211,6 +214,142 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "electric-slash-horizontal1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 11 + } + ], + "_prefab": { + "__id__": 13 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 25.352, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 2, + "y": 2, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 95, + "height": 48 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "598QTUIYhAD5NxyPBcSrlV" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@f6490", + "__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": "79xdyqEqhFdZmXNHgUvUaA" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d1hgL10YVE8a0CvDCyOdTd", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -221,7 +360,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 9 + "__id__": 15 }, "_contentSize": { "__type__": "cc.Size", @@ -249,7 +388,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 17 }, "atk_x": 20, "atk_y": 40, @@ -261,6 +400,10 @@ "forceStartX": -1, "forceStartY": -1, "summon_count": 1, + "summon_target_mode": 0, + "summon_x_offset": 0, + "summon_y_offset": 0, + "summon_interval": 0, "height_offset": 0, "_id": "" }, @@ -278,7 +421,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 19 }, "enabledContactListener": true, "bullet": false, @@ -312,7 +455,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 21 }, "tag": 0, "_group": 1, @@ -346,7 +489,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 23 }, "playOnLoad": true, "_clips": [ diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index 37fa2241..9902daac 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -361,7 +361,7 @@ export const SkillSet: Record = { RType: RType.bezier, EType: EType.collision, info: "火焰斩动画",//英雄配置技能的时候,可以叠加暴击debuff }, 6103: { - uuid: 6103, name: "闪电斩", sp_name: "atk5", icon: "100-Enchant-Magic", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "max0", + uuid: 6103, name: "闪电斩", sp_name: "atk6", icon: "100-Enchant-Magic", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "max0", DTType: DTType.single, ap: 150, hit_count: 5, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, is_accel: true, RType: RType.bezier, EType: EType.collision, info: "闪电斩动画",//英雄配置技能的时候,可以疲惫触发闪电系追加技能 },