diff --git a/assets/resources/game/heros/ha1.prefab b/assets/resources/game/heros/ha1.prefab index e79ea96a..227ff54d 100644 --- a/assets/resources/game/heros/ha1.prefab +++ b/assets/resources/game/heros/ha1.prefab @@ -381,7 +381,7 @@ "__expectedType__": "cc.AnimationClip" }, { - "__uuid__": "a4fdf2ea-9af6-443e-aba6-6d3c94187f84", + "__uuid__": "2c669f9b-1dfc-4cf1-ab71-824c742cc40a", "__expectedType__": "cc.AnimationClip" }, { diff --git a/assets/resources/game/heros/hero/ha1/atk1.anim b/assets/resources/game/heros/hero/ha1/atk1.anim index 6d41b5a0..efdfb568 100644 --- a/assets/resources/game/heros/hero/ha1/atk1.anim +++ b/assets/resources/game/heros/hero/ha1/atk1.anim @@ -1,13 +1,13 @@ [ { "__type__": "cc.AnimationClip", - "_name": "atk1", + "_name": "atk0", "_objFlags": 0, "__editorExtras__": { "embeddedPlayerGroups": [] }, "_native": "", - "sample": 15, + "sample": 30, "speed": 1, "wrapMode": 1, "enableTrsBlending": false, @@ -62,55 +62,105 @@ "__type__": "cc.ObjectCurve", "_times": [ 0, + 0.03333333333333333, 0.06666666666666667, + 0.1, 0.13333333333333333, + 0.16666666666666666, 0.2, + 0.23333333333333334, 0.26666666666666666, + 0.3, 0.3333333333333333, + 0.36666666666666664, 0.4, + 0.43333333333333335, 0.4666666666666667, + 0.5, 0.5333333333333333, - 0.6 + 0.5666666666666667, + 0.6, + 0.6333333333333333 ], "_values": [ { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@79d0c", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e9205", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@a6592", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@35cb3", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@96f7b", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@20d4b", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@df8c7", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@0f1aa", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@6fae3", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@cbd6c", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@fb666", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@d6f67", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@3f67c", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@993b3", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@efa5f", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@f23a3", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@ac910", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@85956", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@61cee", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e66fc", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@0b4f6", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@ec4aa", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@64b4c", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@14bf2", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@24319", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@64c77", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@faf01", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@a02f7", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@52c3b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@c2676", "__expectedType__": "cc.SpriteFrame" } ] diff --git a/assets/resources/game/heros/hero/ha1/atk1.anim.meta b/assets/resources/game/heros/hero/ha1/atk1.anim.meta index 0735bce6..c19250af 100644 --- a/assets/resources/game/heros/hero/ha1/atk1.anim.meta +++ b/assets/resources/game/heros/hero/ha1/atk1.anim.meta @@ -1 +1,13 @@ -{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"a4fdf2ea-9af6-443e-aba6-6d3c94187f84","files":[".cconb"],"subMetas":{},"userData":{"name":"atk1"}} +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "2c669f9b-1dfc-4cf1-ab71-824c742cc40a", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk1" + } +} diff --git a/assets/resources/game/skill/atk/arrow_big_yellow.prefab b/assets/resources/game/skill/atk/arrow_big_yellow.prefab index 7fda760c..a6b1de7e 100644 --- a/assets/resources/game/skill/atk/arrow_big_yellow.prefab +++ b/assets/resources/game/skill/atk/arrow_big_yellow.prefab @@ -281,7 +281,7 @@ "__id__": 13 }, "atk_x": 10, - "atk_y": 30, + "atk_y": 15, "debugMode": true, "_id": "" }, diff --git a/assets/resources/game/skill/atk/arrow_blue.prefab b/assets/resources/game/skill/atk/arrow_blue.prefab index 8d666d33..105f36cf 100644 --- a/assets/resources/game/skill/atk/arrow_blue.prefab +++ b/assets/resources/game/skill/atk/arrow_blue.prefab @@ -420,7 +420,7 @@ "__id__": 19 }, "atk_x": 10, - "atk_y": 30, + "atk_y": 15, "debugMode": false, "_id": "" }, diff --git a/assets/resources/game/skill/atk/arrow_green.prefab b/assets/resources/game/skill/atk/arrow_green.prefab index ee7ef351..286796cb 100644 --- a/assets/resources/game/skill/atk/arrow_green.prefab +++ b/assets/resources/game/skill/atk/arrow_green.prefab @@ -423,7 +423,7 @@ "__id__": 19 }, "atk_x": 10, - "atk_y": 30, + "atk_y": 15, "debugMode": true, "_id": "" }, diff --git a/assets/resources/game/skill/atk/arrow_red.prefab b/assets/resources/game/skill/atk/arrow_red.prefab index 9a6e53f0..7134a8db 100644 --- a/assets/resources/game/skill/atk/arrow_red.prefab +++ b/assets/resources/game/skill/atk/arrow_red.prefab @@ -423,7 +423,7 @@ "__id__": 19 }, "atk_x": 10, - "atk_y": 30, + "atk_y": 15, "debugMode": true, "_id": "" }, diff --git a/assets/resources/game/skill/atk/ball_fire.prefab b/assets/resources/game/skill/atk/ball_fire.prefab index 6a0252dd..11c18ce1 100644 --- a/assets/resources/game/skill/atk/ball_fire.prefab +++ b/assets/resources/game/skill/atk/ball_fire.prefab @@ -281,7 +281,7 @@ "__id__": 13 }, "atk_x": 10, - "atk_y": 30, + "atk_y": 15, "debugMode": true, "_id": "" }, diff --git a/assets/resources/game/skill/atk/ball_forst.prefab b/assets/resources/game/skill/atk/ball_forst.prefab index ff0e5fb2..6414709f 100644 --- a/assets/resources/game/skill/atk/ball_forst.prefab +++ b/assets/resources/game/skill/atk/ball_forst.prefab @@ -281,7 +281,7 @@ "__id__": 13 }, "atk_x": 10, - "atk_y": 30, + "atk_y": 15, "debugMode": true, "_id": "" }, diff --git a/assets/resources/game/skill/atk/ball_gquan.prefab b/assets/resources/game/skill/atk/ball_gquan.prefab index 8b0ed966..42c4174f 100644 --- a/assets/resources/game/skill/atk/ball_gquan.prefab +++ b/assets/resources/game/skill/atk/ball_gquan.prefab @@ -281,7 +281,7 @@ "__id__": 13 }, "atk_x": 10, - "atk_y": 30, + "atk_y": 15, "debugMode": false, "_id": "" }, diff --git a/assets/resources/game/skill/atk/ball_guang.prefab b/assets/resources/game/skill/atk/ball_guang.prefab index c67b13fc..855873cf 100644 --- a/assets/resources/game/skill/atk/ball_guang.prefab +++ b/assets/resources/game/skill/atk/ball_guang.prefab @@ -281,7 +281,7 @@ "__id__": 13 }, "atk_x": 10, - "atk_y": 30, + "atk_y": 15, "debugMode": true, "_id": "" }, diff --git a/assets/resources/game/skill/atk/ball_ice.prefab b/assets/resources/game/skill/atk/ball_ice.prefab index 5b37b51b..9729ef05 100644 --- a/assets/resources/game/skill/atk/ball_ice.prefab +++ b/assets/resources/game/skill/atk/ball_ice.prefab @@ -281,7 +281,7 @@ "__id__": 13 }, "atk_x": 10, - "atk_y": 30, + "atk_y": 15, "debugMode": true, "_id": "" }, diff --git a/assets/resources/game/skill/atk/ball_light.prefab b/assets/resources/game/skill/atk/ball_light.prefab index 1a36401b..efb064b9 100644 --- a/assets/resources/game/skill/atk/ball_light.prefab +++ b/assets/resources/game/skill/atk/ball_light.prefab @@ -281,7 +281,7 @@ "__id__": 13 }, "atk_x": 10, - "atk_y": 30, + "atk_y": 15, "debugMode": true, "_id": "" }, diff --git a/assets/resources/game/skill/atk/fire_wall.prefab b/assets/resources/game/skill/atk/fire_wall.prefab index 854a541c..bb3b5aeb 100644 --- a/assets/resources/game/skill/atk/fire_wall.prefab +++ b/assets/resources/game/skill/atk/fire_wall.prefab @@ -280,8 +280,8 @@ "__prefab": { "__id__": 13 }, - "atk_x": 10, - "atk_y": 30, + "atk_x": 0, + "atk_y": 0, "debugMode": true, "_id": "" },