From 2a842f533ebfd0f2a0719fe7254b6672c18f0f61 Mon Sep 17 00:00:00 2001 From: panw Date: Tue, 17 Mar 2026 10:26:14 +0800 Subject: [PATCH] =?UTF-8?q?feat(skill):=20=E6=96=B0=E5=A2=9Ebuff=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E5=8A=A8=E7=94=BB=E5=B9=B6=E8=B0=83=E6=95=B4=E7=AE=AD?= =?UTF-8?q?=E7=9F=A2=E6=8A=80=E8=83=BD=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增buff_bg.prefab及其动画资源，用于技能buff背景效果 - 新增arrow_big_yellow.prefab及其动画资源，添加黄色大箭矢技能 - 调整红、蓝、绿箭矢prefab的碰撞框尺寸（70×20→60×30） - 为atk_s2.prefab添加spriteFrame并启用debugMode - 更新SkillSet配置，调整基础技能对应的动画资源 - 优化atk02.anim和atk03.anim动画时长，移除冗余帧 - 重构箭矢动画文件结构，将atk_arrow_*重命名为arrow_*并更新引用 - 在ha1.prefab中集成buff_bg作为子节点 --- assets/resources/game/heros/ha1.prefab | 320 ++++++++++----- .../game/skill/anm/atk/arrow_big_yellow.anim | 95 +++++ .../skill/anm/atk/arrow_big_yellow.anim.meta | 13 + .../{atk_arrow_blue.anim => arrow_blue.anim} | 0 ...ow_blue.anim.meta => arrow_blue.anim.meta} | 2 +- ...{atk_arrow_green.anim => arrow_green.anim} | 0 ..._green.anim.meta => arrow_green.anim.meta} | 2 +- .../{atk_arrow_red.anim => arrow_red.anim} | 0 ...rrow_red.anim.meta => arrow_red.anim.meta} | 2 +- .../resources/game/skill/anm/atk/atk02.anim | 24 +- .../resources/game/skill/anm/atk/atk03.anim | 38 +- .../game/skill/anm/buff/buff_bg.anim | 110 ++++++ .../game/skill/anm/buff/buff_bg.anim.meta | 13 + .../game/skill/atk/arrow_big_yellow.prefab | 372 ++++++++++++++++++ .../skill/atk/arrow_big_yellow.prefab.meta | 13 + .../game/skill/atk/arrow_blue.prefab | 4 +- .../game/skill/atk/arrow_green.prefab | 4 +- .../resources/game/skill/atk/arrow_red.prefab | 4 +- assets/resources/game/skill/atk/atk_s2.prefab | 6 +- .../resources/game/skill/buff/buff_bg.prefab | 274 +++++++++++++ .../game/skill/buff/buff_bg.prefab.meta | 13 + assets/script/game/common/config/SkillSet.ts | 4 +- 22 files changed, 1157 insertions(+), 156 deletions(-) create mode 100644 assets/resources/game/skill/anm/atk/arrow_big_yellow.anim create mode 100644 assets/resources/game/skill/anm/atk/arrow_big_yellow.anim.meta rename assets/resources/game/skill/anm/atk/{atk_arrow_blue.anim => arrow_blue.anim} (100%) rename assets/resources/game/skill/anm/atk/{atk_arrow_blue.anim.meta => arrow_blue.anim.meta} (86%) rename assets/resources/game/skill/anm/atk/{atk_arrow_green.anim => arrow_green.anim} (100%) rename assets/resources/game/skill/anm/atk/{atk_arrow_green.anim.meta => arrow_green.anim.meta} (86%) rename assets/resources/game/skill/anm/atk/{atk_arrow_red.anim => arrow_red.anim} (100%) rename assets/resources/game/skill/anm/atk/{atk_arrow_red.anim.meta => arrow_red.anim.meta} (87%) create mode 100644 assets/resources/game/skill/anm/buff/buff_bg.anim create mode 100644 assets/resources/game/skill/anm/buff/buff_bg.anim.meta create mode 100644 assets/resources/game/skill/atk/arrow_big_yellow.prefab create mode 100644 assets/resources/game/skill/atk/arrow_big_yellow.prefab.meta create mode 100644 assets/resources/game/skill/buff/buff_bg.prefab create mode 100644 assets/resources/game/skill/buff/buff_bg.prefab.meta diff --git a/assets/resources/game/heros/ha1.prefab b/assets/resources/game/heros/ha1.prefab index 27583b78..628135ac 100644 --- a/assets/resources/game/heros/ha1.prefab +++ b/assets/resources/game/heros/ha1.prefab @@ -22,32 +22,38 @@ "__id__": 2 }, { - "__id__": 14 + "__id__": 10 }, { - "__id__": 26 + "__id__": 22 + }, + { + "__id__": 34 } ], "_active": true, "_components": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 41 - }, - { - "__id__": 43 - }, { "__id__": 45 + }, + { + "__id__": 47 + }, + { + "__id__": 49 + }, + { + "__id__": 51 + }, + { + "__id__": 53 + }, + { + "__id__": 55 } ], "_prefab": { - "__id__": 47 + "__id__": 57 }, "_lpos": { "__type__": "cc.Vec3", @@ -78,6 +84,118 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_prefab": { + "__id__": 3 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 2 + }, + "asset": { + "__uuid__": "9528e2ff-e9a0-42f8-88bd-0f172275e351", + "__expectedType__": "cc.Prefab" + }, + "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "instance": { + "__id__": 4 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "ecYwq1qKpMKr8GrIORiOp1", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 8 + }, + { + "__id__": 9 + } + ], + "removedComponents": [] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_name" + ], + "value": "buff_bg" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c46/YsCPVOJYA4mWEpNYRx" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": -15.783, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.Node", "_name": "anm", @@ -89,24 +207,24 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - }, - { - "__id__": 7 - }, - { - "__id__": 9 - }, { "__id__": 11 + }, + { + "__id__": 13 + }, + { + "__id__": 15 + }, + { + "__id__": 17 + }, + { + "__id__": 19 } ], "_prefab": { - "__id__": 13 + "__id__": 21 }, "_lpos": { "__type__": "cc.Vec3", @@ -143,11 +261,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 4 + "__id__": 12 }, "_contentSize": { "__type__": "cc.Size", @@ -171,11 +289,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 6 + "__id__": 14 }, "_id": "" }, @@ -189,11 +307,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 8 + "__id__": 16 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -237,11 +355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 10 + "__id__": 18 }, "playOnLoad": true, "_clips": [ @@ -302,11 +420,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 20 }, "hitFlashMaterial": { "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", @@ -338,14 +456,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 15 + "__id__": 23 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 14 + "__id__": 22 }, "asset": { "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", @@ -353,7 +471,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 16 + "__id__": 24 }, "targetOverrides": null }, @@ -366,26 +484,26 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 17 - }, - { - "__id__": 19 - }, - { - "__id__": 20 - }, - { - "__id__": 21 - }, - { - "__id__": 22 - }, - { - "__id__": 23 - }, { "__id__": 25 + }, + { + "__id__": 27 + }, + { + "__id__": 28 + }, + { + "__id__": 29 + }, + { + "__id__": 30 + }, + { + "__id__": 31 + }, + { + "__id__": 33 } ], "removedComponents": [] @@ -393,7 +511,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_name" @@ -409,7 +527,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lpos" @@ -424,7 +542,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lrot" @@ -440,7 +558,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_euler" @@ -455,7 +573,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_active" @@ -465,7 +583,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 32 }, "propertyPath": [ "_contentSize" @@ -485,7 +603,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 18 + "__id__": 26 }, "propertyPath": [ "_lscale" @@ -504,14 +622,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 27 + "__id__": 35 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 26 + "__id__": 34 }, "asset": { "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", @@ -519,7 +637,7 @@ }, "fileId": "5fqU0L3/FOhKaco5UkHuWT", "instance": { - "__id__": 28 + "__id__": 36 }, "targetOverrides": null }, @@ -533,22 +651,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 29 + "__id__": 37 }, { - "__id__": 31 + "__id__": 39 }, { - "__id__": 32 + "__id__": 40 }, { - "__id__": 33 + "__id__": 41 }, { - "__id__": 34 + "__id__": 42 }, { - "__id__": 36 + "__id__": 44 } ], "removedComponents": [] @@ -556,7 +674,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_name" @@ -572,7 +690,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lpos" @@ -587,7 +705,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lrot" @@ -603,7 +721,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_euler" @@ -618,7 +736,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 35 + "__id__": 43 }, "propertyPath": [ "_lpos" @@ -639,7 +757,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 30 + "__id__": 38 }, "propertyPath": [ "_lscale" @@ -661,7 +779,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 46 }, "_contentSize": { "__type__": "cc.Size", @@ -689,10 +807,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 48 }, "anm": { - "__id__": 5 + "__id__": 13 }, "_id": "" }, @@ -710,7 +828,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 50 }, "debugMode": false, "_id": "" @@ -729,7 +847,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 52 }, "enabledContactListener": true, "bullet": false, @@ -763,7 +881,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 46 + "__id__": 54 }, "tag": 0, "_group": 4, @@ -787,6 +905,27 @@ "__type__": "cc.CompPrefabInfo", "fileId": "23j+p5lLdC+r4iKSVeLNM4" }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 56 + }, + "playOnLoad": false, + "_clips": [], + "_defaultClip": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "49+IQe4gZPPYzJ/FgxeX/O" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -800,10 +939,13 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 26 + "__id__": 34 }, { - "__id__": 14 + "__id__": 22 + }, + { + "__id__": 2 } ] } diff --git a/assets/resources/game/skill/anm/atk/arrow_big_yellow.anim b/assets/resources/game/skill/anm/atk/arrow_big_yellow.anim new file mode 100644 index 00000000..cf1a0977 --- /dev/null +++ b/assets/resources/game/skill/anm/atk/arrow_big_yellow.anim @@ -0,0 +1,95 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "arrow_big_yellow", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 12, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.25, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 7 + }, + "_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.08333333333333333, + 0.16666666666666666 + ], + "_values": [ + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@dd275", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@74bc4", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@a1f74", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skill/anm/atk/arrow_big_yellow.anim.meta b/assets/resources/game/skill/anm/atk/arrow_big_yellow.anim.meta new file mode 100644 index 00000000..3f7f6a8e --- /dev/null +++ b/assets/resources/game/skill/anm/atk/arrow_big_yellow.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "cc781245-3d79-498f-9337-3bf65fbbcd06", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "arrow_big_yellow" + } +} diff --git a/assets/resources/game/skill/anm/atk/atk_arrow_blue.anim b/assets/resources/game/skill/anm/atk/arrow_blue.anim similarity index 100% rename from assets/resources/game/skill/anm/atk/atk_arrow_blue.anim rename to assets/resources/game/skill/anm/atk/arrow_blue.anim diff --git a/assets/resources/game/skill/anm/atk/atk_arrow_blue.anim.meta b/assets/resources/game/skill/anm/atk/arrow_blue.anim.meta similarity index 86% rename from assets/resources/game/skill/anm/atk/atk_arrow_blue.anim.meta rename to assets/resources/game/skill/anm/atk/arrow_blue.anim.meta index ceb3a3cb..4c389605 100644 --- a/assets/resources/game/skill/anm/atk/atk_arrow_blue.anim.meta +++ b/assets/resources/game/skill/anm/atk/arrow_blue.anim.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "name": "atk_arrow_blue" + "name": "arrow_blue" } } diff --git a/assets/resources/game/skill/anm/atk/atk_arrow_green.anim b/assets/resources/game/skill/anm/atk/arrow_green.anim similarity index 100% rename from assets/resources/game/skill/anm/atk/atk_arrow_green.anim rename to assets/resources/game/skill/anm/atk/arrow_green.anim diff --git a/assets/resources/game/skill/anm/atk/atk_arrow_green.anim.meta b/assets/resources/game/skill/anm/atk/arrow_green.anim.meta similarity index 86% rename from assets/resources/game/skill/anm/atk/atk_arrow_green.anim.meta rename to assets/resources/game/skill/anm/atk/arrow_green.anim.meta index 88438be1..ecb94db3 100644 --- a/assets/resources/game/skill/anm/atk/atk_arrow_green.anim.meta +++ b/assets/resources/game/skill/anm/atk/arrow_green.anim.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "name": "atk_arrow_green" + "name": "arrow_green" } } diff --git a/assets/resources/game/skill/anm/atk/atk_arrow_red.anim b/assets/resources/game/skill/anm/atk/arrow_red.anim similarity index 100% rename from assets/resources/game/skill/anm/atk/atk_arrow_red.anim rename to assets/resources/game/skill/anm/atk/arrow_red.anim diff --git a/assets/resources/game/skill/anm/atk/atk_arrow_red.anim.meta b/assets/resources/game/skill/anm/atk/arrow_red.anim.meta similarity index 87% rename from assets/resources/game/skill/anm/atk/atk_arrow_red.anim.meta rename to assets/resources/game/skill/anm/atk/arrow_red.anim.meta index 1be441f1..03147e8c 100644 --- a/assets/resources/game/skill/anm/atk/atk_arrow_red.anim.meta +++ b/assets/resources/game/skill/anm/atk/arrow_red.anim.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "name": "atk_arrow_red" + "name": "arrow_red" } } diff --git a/assets/resources/game/skill/anm/atk/atk02.anim b/assets/resources/game/skill/anm/atk/atk02.anim index 0e6dd21b..20b6d9ce 100644 --- a/assets/resources/game/skill/anm/atk/atk02.anim +++ b/assets/resources/game/skill/anm/atk/atk02.anim @@ -11,7 +11,7 @@ "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.375, + "_duration": 0.25, "_hash": 500763545, "_tracks": [ { @@ -84,20 +84,9 @@ 0.08333333333333333, 0.125, 0.16666666666666666, - 0.20833333333333334, - 0.25, - 0.2916666666666667, - 0.3333333333333333 + 0.20833333333333334 ], "_values": [ - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@abfb5", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@76684", - "__expectedType__": "cc.SpriteFrame" - }, { "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b1a7d", "__expectedType__": "cc.SpriteFrame" @@ -118,14 +107,7 @@ "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@4b91b", "__expectedType__": "cc.SpriteFrame" }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@7ab97", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@afacf", - "__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 c2cbeda8..13d97d10 100644 --- a/assets/resources/game/skill/anm/atk/atk03.anim +++ b/assets/resources/game/skill/anm/atk/atk03.anim @@ -11,7 +11,7 @@ "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.4583333333333333, + "_duration": 0.20833333333333334, "_hash": 500763545, "_tracks": [ { @@ -21,12 +21,12 @@ "_exoticAnimation": null, "_events": [ { - "frame": 0.20833333333333334, + "frame": 0.125, "func": "", "params": [] }, { - "frame": 0.20833333333333334, + "frame": 0.125, "func": "atk", "params": [] } @@ -83,23 +83,9 @@ 0.041666666666666664, 0.08333333333333333, 0.125, - 0.16666666666666666, - 0.20833333333333334, - 0.25, - 0.2916666666666667, - 0.3333333333333333, - 0.375, - 0.4166666666666667 + 0.16666666666666666 ], "_values": [ - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@5b928", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@21cc6", - "__expectedType__": "cc.SpriteFrame" - }, { "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@6fcd5", "__expectedType__": "cc.SpriteFrame" @@ -119,22 +105,6 @@ { "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@c09bc", "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@01cc3", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@bb1ab", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@3e49d", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@6d522", - "__expectedType__": "cc.SpriteFrame" } ] }, diff --git a/assets/resources/game/skill/anm/buff/buff_bg.anim b/assets/resources/game/skill/anm/buff/buff_bg.anim new file mode 100644 index 00000000..844d3690 --- /dev/null +++ b/assets/resources/game/skill/anm/buff/buff_bg.anim @@ -0,0 +1,110 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "buff_bg", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 20, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.3, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 7 + }, + "_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": "skill" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 6 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.05, + 0.1, + 0.15, + 0.2, + 0.25 + ], + "_values": [ + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@35919", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@28630", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@d5f7a", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@a426d", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@d8ab8", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@65c32", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skill/anm/buff/buff_bg.anim.meta b/assets/resources/game/skill/anm/buff/buff_bg.anim.meta new file mode 100644 index 00000000..6590c495 --- /dev/null +++ b/assets/resources/game/skill/anm/buff/buff_bg.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "a732ebac-b3c8-4f43-ac73-67a90a02ecfa", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "buff_bg" + } +} diff --git a/assets/resources/game/skill/atk/arrow_big_yellow.prefab b/assets/resources/game/skill/atk/arrow_big_yellow.prefab new file mode 100644 index 00000000..6202b62e --- /dev/null +++ b/assets/resources/game/skill/atk/arrow_big_yellow.prefab @@ -0,0 +1,372 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "arrow_big_yellow", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "arrow_big_yellow", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 8 + }, + { + "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + } + ], + "_prefab": { + "__id__": 18 + }, + "_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": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Node", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + } + ], + "_prefab": { + "__id__": 7 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0.7071067811865475, + "w": 0.7071067811865476 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.8, + "y": 0.8, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 90 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 59, + "height": 199 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "93pNmvtQlLSqtTgIepyEmA" + }, + { + "__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": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@dd275", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "12eKc8gltBz50frJCS5+ww" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "3arqAMBz1MvoXBzeDaL5M/", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 40, + "height": 10 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "cc781245-3d79-498f-9337-3bf65fbbcd06", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "cc781245-3d79-498f-9337-3bf65fbbcd06", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c2RDvksalG2acL3tyGCY0t" + }, + { + "__type__": "57aabs7TE1J5obTAZczc+64", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "atk_x": 10, + "atk_y": 30, + "debugMode": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "60LInmZXxDtKu79AshRG9j" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "enabledContactListener": true, + "bullet": false, + "awakeOnLoad": true, + "_group": 1, + "_type": 1, + "_allowSleep": true, + "_gravityScale": 1, + "_linearDamping": 0, + "_angularDamping": 0, + "_linearVelocity": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_angularVelocity": 0, + "_fixedRotation": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e1yBA625RLwLhzo6bLYW7j" + }, + { + "__type__": "cc.BoxCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "tag": 0, + "_group": 1, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_size": { + "__type__": "cc.Size", + "width": 30, + "height": 10 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "43ZDJfXX9AX73gyytKQZWm" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "instance": null, + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skill/atk/arrow_big_yellow.prefab.meta b/assets/resources/game/skill/atk/arrow_big_yellow.prefab.meta new file mode 100644 index 00000000..96b9adf2 --- /dev/null +++ b/assets/resources/game/skill/atk/arrow_big_yellow.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "60259315-1ac4-462a-bee2-37cf390c6fe7", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "arrow_big_yellow" + } +} diff --git a/assets/resources/game/skill/atk/arrow_blue.prefab b/assets/resources/game/skill/atk/arrow_blue.prefab index 9fdf6ab2..8d666d33 100644 --- a/assets/resources/game/skill/atk/arrow_blue.prefab +++ b/assets/resources/game/skill/atk/arrow_blue.prefab @@ -275,8 +275,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 70, - "height": 20 + "width": 60, + "height": 30 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/resources/game/skill/atk/arrow_green.prefab b/assets/resources/game/skill/atk/arrow_green.prefab index 5caa1586..ee7ef351 100644 --- a/assets/resources/game/skill/atk/arrow_green.prefab +++ b/assets/resources/game/skill/atk/arrow_green.prefab @@ -278,8 +278,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 70, - "height": 20 + "width": 60, + "height": 30 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/resources/game/skill/atk/arrow_red.prefab b/assets/resources/game/skill/atk/arrow_red.prefab index 3218ec1d..9a6e53f0 100644 --- a/assets/resources/game/skill/atk/arrow_red.prefab +++ b/assets/resources/game/skill/atk/arrow_red.prefab @@ -278,8 +278,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 70, - "height": 20 + "width": 60, + "height": 30 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/resources/game/skill/atk/atk_s2.prefab b/assets/resources/game/skill/atk/atk_s2.prefab index 667aa3e4..8fbb27f1 100644 --- a/assets/resources/game/skill/atk/atk_s2.prefab +++ b/assets/resources/game/skill/atk/atk_s2.prefab @@ -175,7 +175,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b1a7d", + "__expectedType__": "cc.SpriteFrame" + }, "_type": 0, "_fillType": 0, "_sizeMode": 0, @@ -457,6 +460,7 @@ }, "atk_x": 0, "atk_y": 0, + "debugMode": false, "_id": "" }, { diff --git a/assets/resources/game/skill/buff/buff_bg.prefab b/assets/resources/game/skill/buff/buff_bg.prefab new file mode 100644 index 00000000..947c1f3c --- /dev/null +++ b/assets/resources/game/skill/buff/buff_bg.prefab @@ -0,0 +1,274 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "buff_bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "buff_bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 8 + }, + { + "__id__": 10 + } + ], + "_prefab": { + "__id__": 12 + }, + "_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": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "skill", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + } + ], + "_prefab": { + "__id__": 7 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -2, + "y": -5, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1.1, + "y": 1.1, + "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": 150, + "height": 168 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b4sNQPJWFKha7x75SWXmRj" + }, + { + "__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": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@35919", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 1, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0.2, + "_fillRange": 1, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9a+65VIghBm4HQxuHPQ/mg" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7a5LvbdlxEc6FKa7cun2oB", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 80, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "a732ebac-b3c8-4f43-ac73-67a90a02ecfa", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "a732ebac-b3c8-4f43-ac73-67a90a02ecfa", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c6LOemuvJKyYCqlF/yUJcr" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "instance": null, + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skill/buff/buff_bg.prefab.meta b/assets/resources/game/skill/buff/buff_bg.prefab.meta new file mode 100644 index 00000000..efceba74 --- /dev/null +++ b/assets/resources/game/skill/buff/buff_bg.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "9528e2ff-e9a0-42f8-88bd-0f172275e351", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "buff_bg" + } +} diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index e2e8d5ff..090adf48 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -186,13 +186,13 @@ export interface SkillConfig { export const SkillSet: Record = { // ========== 基础攻击 ========== 6001-6099 6001: { - uuid:6001,name:"空挥",sp_name:"atk_s1",icon:"1026",TGroup:TGroup.Enemy,TType:TType.Frontline,readyAnm:"",endAnm:"",act:"atk",DTType:DTType.single, + uuid:6001,name:"空挥",sp_name:"atk_s2",icon:"1026",TGroup:TGroup.Enemy,TType:TType.Frontline,readyAnm:"",endAnm:"",act:"atk",DTType:DTType.single, ap:100,hit_count:1,hitcd:0.2,speed:720,with:0, ready:0,EAnm:0,DAnm:9001,RType:RType.fixed,EType:EType.animationEnd, buffs:[],debuffs:[],info:"对前方目标造成100%攻击的伤害", }, 6002: { - uuid:6002,name:"电击",sp_name:"atk_s4",icon:"1173",TGroup:TGroup.Enemy,TType:TType.Frontline,readyAnm:"",endAnm:"",act:"max",DTType:DTType.single, + uuid:6002,name:"电击",sp_name:"atk_s3",icon:"1173",TGroup:TGroup.Enemy,TType:TType.Frontline,readyAnm:"",endAnm:"",act:"max",DTType:DTType.single, ap:100,hit_count:1,hitcd:0.2,speed:720,with:0, ready:0,EAnm:0,DAnm:9001,RType:RType.fixed,EType:EType.collision, buffs:[],debuffs:[],info:"对前方目标造成150%攻击的伤害",