From 3dc5b9b48dd67980cf346af606fa14e7fc1de05b Mon Sep 17 00:00:00 2001 From: panw Date: Thu, 19 Mar 2026 10:40:08 +0800 Subject: [PATCH] =?UTF-8?q?feat(animation):=20=E6=9B=B4=E6=96=B0=E8=8B=B1?= =?UTF-8?q?=E9=9B=84=E6=94=BB=E5=87=BB=E5=8A=A8=E7=94=BB=E5=B9=B6=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E9=BB=98=E8=AE=A4=E5=89=AA=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 ha1 和 mo2 英雄的 atk2/atk1 动画重命名为 atk0 - 提高动画采样率从 15/20 到 30，缩短持续时间至 0.667 秒 - 更新动画元数据 UUID 以匹配新资源 - 在 prefab 中移除 _defaultClip 引用，避免默认动画冲突 --- assets/resources/game/heros/ha1.prefab | 7 +- .../resources/game/heros/hero/ha1/atk2.anim | 76 ++++++++++++------- .../game/heros/hero/ha1/atk2.anim.meta | 14 +++- .../resources/game/heros/hero/mo2/atk1.anim | 74 +++++++++++++----- .../game/heros/hero/mo2/atk1.anim.meta | 14 +++- .../game/heros/hero/mo2/atk2.anim.meta | 14 +++- assets/resources/game/heros/mo2.prefab | 9 +-- 7 files changed, 149 insertions(+), 59 deletions(-) diff --git a/assets/resources/game/heros/ha1.prefab b/assets/resources/game/heros/ha1.prefab index 227ff54d..464e4d56 100644 --- a/assets/resources/game/heros/ha1.prefab +++ b/assets/resources/game/heros/ha1.prefab @@ -385,7 +385,7 @@ "__expectedType__": "cc.AnimationClip" }, { - "__uuid__": "cf5c013e-cdb0-4563-99c6-968ce93525c2", + "__uuid__": "cc0c68c4-9189-48b0-83b5-375839621837", "__expectedType__": "cc.AnimationClip" }, { @@ -417,10 +417,7 @@ "__expectedType__": "cc.AnimationClip" } ], - "_defaultClip": { - "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", - "__expectedType__": "cc.AnimationClip" - }, + "_defaultClip": null, "_id": "" }, { diff --git a/assets/resources/game/heros/hero/ha1/atk2.anim b/assets/resources/game/heros/hero/ha1/atk2.anim index 40f89a04..efdfb568 100644 --- a/assets/resources/game/heros/hero/ha1/atk2.anim +++ b/assets/resources/game/heros/hero/ha1/atk2.anim @@ -1,17 +1,17 @@ [ { "__type__": "cc.AnimationClip", - "_name": "atk2", + "_name": "atk0", "_objFlags": 0, "__editorExtras__": { "embeddedPlayerGroups": [] }, "_native": "", - "sample": 20, + "sample": 30, "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.8, + "_duration": 0.6666666666666666, "_hash": 500763545, "_tracks": [ { @@ -62,85 +62,105 @@ "__type__": "cc.ObjectCurve", "_times": [ 0, - 0.05, + 0.03333333333333333, + 0.06666666666666667, 0.1, - 0.15, + 0.13333333333333333, + 0.16666666666666666, 0.2, - 0.25, + 0.23333333333333334, + 0.26666666666666666, 0.3, - 0.35, + 0.3333333333333333, + 0.36666666666666664, 0.4, - 0.45, + 0.43333333333333335, + 0.4666666666666667, 0.5, - 0.55, + 0.5333333333333333, + 0.5666666666666667, 0.6, - 0.65, - 0.7, - 0.75 + 0.6333333333333333 ], "_values": [ { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e3af9", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e9205", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@5cb03", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@35cb3", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@78df0", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@20d4b", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@7b3fb", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@0f1aa", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@0741b", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@cbd6c", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@27b3e", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@d6f67", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@a84bd", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@993b3", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@b1f80", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@f23a3", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e7fd0", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@85956", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@ea280", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@e66fc", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@4bbc6", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@0b4f6", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@f6cab", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@ec4aa", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@f1a00", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@64b4c", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@2f215", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@14bf2", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@a8e72", + "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@24319", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@f742c", + "__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/atk2.anim.meta b/assets/resources/game/heros/hero/ha1/atk2.anim.meta index 8f5ef9e0..77785897 100644 --- a/assets/resources/game/heros/hero/ha1/atk2.anim.meta +++ b/assets/resources/game/heros/hero/ha1/atk2.anim.meta @@ -1 +1,13 @@ -{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"cf5c013e-cdb0-4563-99c6-968ce93525c2","files":[".cconb"],"subMetas":{},"userData":{"name":"atk2"}} +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "cc0c68c4-9189-48b0-83b5-375839621837", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk2" + } +} diff --git a/assets/resources/game/heros/hero/mo2/atk1.anim b/assets/resources/game/heros/hero/mo2/atk1.anim index 4d86fb57..ef4fd184 100644 --- a/assets/resources/game/heros/hero/mo2/atk1.anim +++ b/assets/resources/game/heros/hero/mo2/atk1.anim @@ -1,17 +1,17 @@ [ { "__type__": "cc.AnimationClip", - "_name": "atk1", + "_name": "atk0", "_objFlags": 0, "__editorExtras__": { "embeddedPlayerGroups": [] }, "_native": "", - "sample": 15, + "sample": 30, "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.8, + "_duration": 0.6666666666666666, "_hash": 500763545, "_tracks": [ { @@ -62,65 +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.5666666666666667, 0.6, - 0.6666666666666666, - 0.7333333333333333 + 0.6333333333333333 ], "_values": [ { - "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@f0fc2", + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@5a37b", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@cd37a", + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@8daa0", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@9d1f4", + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@e7def", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@6413f", + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@a1a34", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@e41e5", + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@047d7", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@f967f", + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@68847", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@f31cc", + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@5cf8f", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@fc2a4", + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@b3d26", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@f0c8a", + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@9c04a", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@ba579", + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@df14d", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@c71ff", + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@67f7f", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@e40ca", + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@2c6a4", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@9a651", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@35c12", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@caef4", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@641f3", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@73d3c", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@09d85", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@45d12", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "9726c7d5-91b6-4111-9c53-05efd7810d4f@d25b5", "__expectedType__": "cc.SpriteFrame" } ] diff --git a/assets/resources/game/heros/hero/mo2/atk1.anim.meta b/assets/resources/game/heros/hero/mo2/atk1.anim.meta index a396ebc9..c71f72d1 100644 --- a/assets/resources/game/heros/hero/mo2/atk1.anim.meta +++ b/assets/resources/game/heros/hero/mo2/atk1.anim.meta @@ -1 +1,13 @@ -{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"d68cb2ce-5f32-4387-a66c-d0546f737ccf","files":[".cconb"],"subMetas":{},"userData":{"name":"atk1"}} +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "06b3f7cc-80a3-4aff-a20a-c398518ca4e8", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk1" + } +} diff --git a/assets/resources/game/heros/hero/mo2/atk2.anim.meta b/assets/resources/game/heros/hero/mo2/atk2.anim.meta index b0227b60..55d6c896 100644 --- a/assets/resources/game/heros/hero/mo2/atk2.anim.meta +++ b/assets/resources/game/heros/hero/mo2/atk2.anim.meta @@ -1 +1,13 @@ -{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"74fccdd7-c5d3-4f9c-bc29-4e17d8f181e1","files":[".cconb"],"subMetas":{},"userData":{"name":"atk2"}} +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "1f1f9e83-4e0a-43fd-ab0b-bd260e793cbb", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk2" + } +} diff --git a/assets/resources/game/heros/mo2.prefab b/assets/resources/game/heros/mo2.prefab index a9e064c4..a9937711 100644 --- a/assets/resources/game/heros/mo2.prefab +++ b/assets/resources/game/heros/mo2.prefab @@ -250,11 +250,11 @@ "__expectedType__": "cc.AnimationClip" }, { - "__uuid__": "d68cb2ce-5f32-4387-a66c-d0546f737ccf", + "__uuid__": "06b3f7cc-80a3-4aff-a20a-c398518ca4e8", "__expectedType__": "cc.AnimationClip" }, { - "__uuid__": "74fccdd7-c5d3-4f9c-bc29-4e17d8f181e1", + "__uuid__": "1f1f9e83-4e0a-43fd-ab0b-bd260e793cbb", "__expectedType__": "cc.AnimationClip" }, { @@ -286,10 +286,7 @@ "__expectedType__": "cc.AnimationClip" } ], - "_defaultClip": { - "__uuid__": "71bc2bec-d961-43e9-9b72-8814118087f2", - "__expectedType__": "cc.AnimationClip" - }, + "_defaultClip": null, "_id": "" }, {