From 7597e6874e5d398c0f43de2684ba6d5bb0e5ba4e Mon Sep 17 00:00:00 2001 From: pan Date: Wed, 17 Jun 2026 14:38:40 +0800 Subject: [PATCH] =?UTF-8?q?feat(skill/atk):=20=E6=96=B0=E5=A2=9E/=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=94=BB=E5=87=BB=E7=89=B9=E6=95=88=E9=A2=84=E5=88=B6?= =?UTF-8?q?=E4=BD=93=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 本次提交完成以下操作： 1. 新增atk_1至atk_5、atk_c6共6个攻击特效预制体及元文件 2. 调整line_1和line_3的精灵帧与动画剪辑资源引用 3. 删除atk_c1至atk_c5共5个废弃的攻击特效预制体 --- .../skill/atk/{atk_c4.prefab => atk_1.prefab} | 18 +- .../{atk_c3.prefab.meta => atk_1.prefab.meta} | 4 +- .../skill/atk/{atk_c2.prefab => atk_2.prefab} | 18 +- .../{atk_c1.prefab.meta => atk_2.prefab.meta} | 4 +- .../skill/atk/{atk_c3.prefab => atk_3.prefab} | 8 +- .../{atk_c4.prefab.meta => atk_3.prefab.meta} | 4 +- .../skill/atk/{atk_c1.prefab => atk_4.prefab} | 18 +- .../{atk_c2.prefab.meta => atk_4.prefab.meta} | 4 +- assets/resources/game/skill/atk/atk_5.prefab | 371 ++++++++++++++++++ .../game/skill/atk/atk_5.prefab.meta | 13 + .../atk/{atk_c5.prefab => atk_c6.prefab} | 4 +- ...{atk_c5.prefab.meta => atk_c6.prefab.meta} | 2 +- assets/resources/game/skill/atk/line_1.prefab | 6 +- .../game/skill/atk/line_1.prefab.meta | 2 +- assets/resources/game/skill/atk/line_3.prefab | 6 +- .../game/skill/atk/line_3.prefab.meta | 2 +- assets/script/game/common/config/SkillSet.ts | 91 ++--- 17 files changed, 480 insertions(+), 95 deletions(-) rename assets/resources/game/skill/atk/{atk_c4.prefab => atk_1.prefab} (95%) rename assets/resources/game/skill/atk/{atk_c3.prefab.meta => atk_1.prefab.meta} (63%) rename assets/resources/game/skill/atk/{atk_c2.prefab => atk_2.prefab} (95%) rename assets/resources/game/skill/atk/{atk_c1.prefab.meta => atk_2.prefab.meta} (63%) rename assets/resources/game/skill/atk/{atk_c3.prefab => atk_3.prefab} (98%) rename assets/resources/game/skill/atk/{atk_c4.prefab.meta => atk_3.prefab.meta} (63%) rename assets/resources/game/skill/atk/{atk_c1.prefab => atk_4.prefab} (95%) rename assets/resources/game/skill/atk/{atk_c2.prefab.meta => atk_4.prefab.meta} (63%) create mode 100644 assets/resources/game/skill/atk/atk_5.prefab create mode 100644 assets/resources/game/skill/atk/atk_5.prefab.meta rename assets/resources/game/skill/atk/{atk_c5.prefab => atk_c6.prefab} (99%) rename assets/resources/game/skill/atk/{atk_c5.prefab.meta => atk_c6.prefab.meta} (86%) diff --git a/assets/resources/game/skill/atk/atk_c4.prefab b/assets/resources/game/skill/atk/atk_1.prefab similarity index 95% rename from assets/resources/game/skill/atk/atk_c4.prefab rename to assets/resources/game/skill/atk/atk_1.prefab index eeee1410..11e833ae 100644 --- a/assets/resources/game/skill/atk/atk_c4.prefab +++ b/assets/resources/game/skill/atk/atk_1.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "atk_c4", + "_name": "atk_1", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "atk_c4", + "_name": "atk_1", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -0.8, - "y": 0.8, + "x": -0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -167,13 +167,13 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 245, + "r": 255, "g": 255, - "b": 0, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@d8028", + "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@a194b", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -254,12 +254,12 @@ "playOnLoad": true, "_clips": [ { - "__uuid__": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7", + "__uuid__": "233b7e98-55a4-429e-9941-55177101a5ad", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7", + "__uuid__": "233b7e98-55a4-429e-9941-55177101a5ad", "__expectedType__": "cc.AnimationClip" }, "_id": "" diff --git a/assets/resources/game/skill/atk/atk_c3.prefab.meta b/assets/resources/game/skill/atk/atk_1.prefab.meta similarity index 63% rename from assets/resources/game/skill/atk/atk_c3.prefab.meta rename to assets/resources/game/skill/atk/atk_1.prefab.meta index 8f610e12..5a43a668 100644 --- a/assets/resources/game/skill/atk/atk_c3.prefab.meta +++ b/assets/resources/game/skill/atk/atk_1.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "f001c311-be1c-4cbf-ac65-61c41cfdd166", + "uuid": "9c67bccd-2f72-41a2-8922-0a90433c97a4", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "atk_c3" + "syncNodeName": "atk_1" } } diff --git a/assets/resources/game/skill/atk/atk_c2.prefab b/assets/resources/game/skill/atk/atk_2.prefab similarity index 95% rename from assets/resources/game/skill/atk/atk_c2.prefab rename to assets/resources/game/skill/atk/atk_2.prefab index e6549f71..2ed5436e 100644 --- a/assets/resources/game/skill/atk/atk_c2.prefab +++ b/assets/resources/game/skill/atk/atk_2.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "atk_c2", + "_name": "atk_2", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "atk_c2", + "_name": "atk_2", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -95,7 +95,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 7.98, + "x": 6.77, "y": 0, "z": 0 }, @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -0.8, - "y": 0.8, + "x": -0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -136,7 +136,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 114, + "width": 122, "height": 61 }, "_anchorPoint": { @@ -173,7 +173,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@42caa", + "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@669b2", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -254,12 +254,12 @@ "playOnLoad": true, "_clips": [ { - "__uuid__": "2dec4df2-c048-4bf8-92c7-e0974639f936", + "__uuid__": "49986def-d75d-44f8-ad5a-0a4610baed20", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "2dec4df2-c048-4bf8-92c7-e0974639f936", + "__uuid__": "49986def-d75d-44f8-ad5a-0a4610baed20", "__expectedType__": "cc.AnimationClip" }, "_id": "" diff --git a/assets/resources/game/skill/atk/atk_c1.prefab.meta b/assets/resources/game/skill/atk/atk_2.prefab.meta similarity index 63% rename from assets/resources/game/skill/atk/atk_c1.prefab.meta rename to assets/resources/game/skill/atk/atk_2.prefab.meta index 889d5c87..6cba8101 100644 --- a/assets/resources/game/skill/atk/atk_c1.prefab.meta +++ b/assets/resources/game/skill/atk/atk_2.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "6954a335-aa5e-4fb5-b0ad-64af6f0f4da1", + "uuid": "5abda248-8958-4afa-bb7e-ef1e3e06cc47", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "atk_c1" + "syncNodeName": "atk_2" } } diff --git a/assets/resources/game/skill/atk/atk_c3.prefab b/assets/resources/game/skill/atk/atk_3.prefab similarity index 98% rename from assets/resources/game/skill/atk/atk_c3.prefab rename to assets/resources/game/skill/atk/atk_3.prefab index 45a1d75b..14c7741a 100644 --- a/assets/resources/game/skill/atk/atk_c3.prefab +++ b/assets/resources/game/skill/atk/atk_3.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "atk_c3", + "_name": "atk_3", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "atk_c3", + "_name": "atk_3", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -167,9 +167,9 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 61, + "r": 255, "g": 255, - "b": 0, + "b": 255, "a": 255 }, "_spriteFrame": { diff --git a/assets/resources/game/skill/atk/atk_c4.prefab.meta b/assets/resources/game/skill/atk/atk_3.prefab.meta similarity index 63% rename from assets/resources/game/skill/atk/atk_c4.prefab.meta rename to assets/resources/game/skill/atk/atk_3.prefab.meta index de37ce3b..f2e05f46 100644 --- a/assets/resources/game/skill/atk/atk_c4.prefab.meta +++ b/assets/resources/game/skill/atk/atk_3.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "7685f842-288f-47d2-82dd-fb92eb82965b", + "uuid": "2777cb82-c0a8-48c7-a8be-d9428bd27893", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "atk_c4" + "syncNodeName": "atk_3" } } diff --git a/assets/resources/game/skill/atk/atk_c1.prefab b/assets/resources/game/skill/atk/atk_4.prefab similarity index 95% rename from assets/resources/game/skill/atk/atk_c1.prefab rename to assets/resources/game/skill/atk/atk_4.prefab index cea79111..57edfafe 100644 --- a/assets/resources/game/skill/atk/atk_c1.prefab +++ b/assets/resources/game/skill/atk/atk_4.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "atk_c1", + "_name": "atk_4", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "atk_c1", + "_name": "atk_4", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -95,7 +95,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 7.98, + "x": 6.77, "y": 0, "z": 0 }, @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -0.8, - "y": 0.8, + "x": -0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -136,7 +136,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 91, + "width": 122, "height": 68 }, "_anchorPoint": { @@ -173,7 +173,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@3d5a0", + "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@9a725", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -254,12 +254,12 @@ "playOnLoad": true, "_clips": [ { - "__uuid__": "c09c3e6a-dd75-47ec-9db8-cd72c0f9fc59", + "__uuid__": "53732b1a-c114-421e-94f9-ec7c1ca70b43", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "c09c3e6a-dd75-47ec-9db8-cd72c0f9fc59", + "__uuid__": "53732b1a-c114-421e-94f9-ec7c1ca70b43", "__expectedType__": "cc.AnimationClip" }, "_id": "" diff --git a/assets/resources/game/skill/atk/atk_c2.prefab.meta b/assets/resources/game/skill/atk/atk_4.prefab.meta similarity index 63% rename from assets/resources/game/skill/atk/atk_c2.prefab.meta rename to assets/resources/game/skill/atk/atk_4.prefab.meta index 833ec673..e02569e3 100644 --- a/assets/resources/game/skill/atk/atk_c2.prefab.meta +++ b/assets/resources/game/skill/atk/atk_4.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "5b0562ad-fbeb-4d41-83bb-b1517b8034fe", + "uuid": "bd9a040f-9b37-4674-bf27-89ba243aee11", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "atk_c2" + "syncNodeName": "atk_4" } } diff --git a/assets/resources/game/skill/atk/atk_5.prefab b/assets/resources/game/skill/atk/atk_5.prefab new file mode 100644 index 00000000..69a13f3f --- /dev/null +++ b/assets/resources/game/skill/atk/atk_5.prefab @@ -0,0 +1,371 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "atk_5", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "atk_5", + "_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": 6.77, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": -0.7, + "y": 0.7, + "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__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 122, + "height": 68 + }, + "_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__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@0ae99", + "__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": { + "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026", + "__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": 50, + "height": 50 + }, + "_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__": "4a4b1b65-1ed4-422c-95c2-15341ad3caf0", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "4a4b1b65-1ed4-422c-95c2-15341ad3caf0", + "__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": 15, + "_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": false, + "_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": 50, + "height": 50 + }, + "_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/atk_5.prefab.meta b/assets/resources/game/skill/atk/atk_5.prefab.meta new file mode 100644 index 00000000..9fbe8c4d --- /dev/null +++ b/assets/resources/game/skill/atk/atk_5.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "961ff574-737f-457d-9f45-38bec63aa6ca", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "atk_5" + } +} diff --git a/assets/resources/game/skill/atk/atk_c5.prefab b/assets/resources/game/skill/atk/atk_c6.prefab similarity index 99% rename from assets/resources/game/skill/atk/atk_c5.prefab rename to assets/resources/game/skill/atk/atk_c6.prefab index f3860972..f0aaf6af 100644 --- a/assets/resources/game/skill/atk/atk_c5.prefab +++ b/assets/resources/game/skill/atk/atk_c6.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "atk_c5", + "_name": "atk_c6", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "atk_c5", + "_name": "atk_c6", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, diff --git a/assets/resources/game/skill/atk/atk_c5.prefab.meta b/assets/resources/game/skill/atk/atk_c6.prefab.meta similarity index 86% rename from assets/resources/game/skill/atk/atk_c5.prefab.meta rename to assets/resources/game/skill/atk/atk_c6.prefab.meta index 63d71fc1..18154747 100644 --- a/assets/resources/game/skill/atk/atk_c5.prefab.meta +++ b/assets/resources/game/skill/atk/atk_c6.prefab.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "syncNodeName": "atk_c5" + "syncNodeName": "atk_c6" } } diff --git a/assets/resources/game/skill/atk/line_1.prefab b/assets/resources/game/skill/atk/line_1.prefab index 84a92b75..2586f726 100644 --- a/assets/resources/game/skill/atk/line_1.prefab +++ b/assets/resources/game/skill/atk/line_1.prefab @@ -173,7 +173,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@d8028", + "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@a194b", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -254,12 +254,12 @@ "playOnLoad": true, "_clips": [ { - "__uuid__": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7", + "__uuid__": "233b7e98-55a4-429e-9941-55177101a5ad", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7", + "__uuid__": "233b7e98-55a4-429e-9941-55177101a5ad", "__expectedType__": "cc.AnimationClip" }, "_id": "" diff --git a/assets/resources/game/skill/atk/line_1.prefab.meta b/assets/resources/game/skill/atk/line_1.prefab.meta index ebbdf9e2..09e520f6 100644 --- a/assets/resources/game/skill/atk/line_1.prefab.meta +++ b/assets/resources/game/skill/atk/line_1.prefab.meta @@ -2,7 +2,7 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "9233eed2-e912-4824-9830-509aa8f76410", + "uuid": "2b7fa972-969e-4bf6-903c-2e8fa9403c01", "files": [ ".json" ], diff --git a/assets/resources/game/skill/atk/line_3.prefab b/assets/resources/game/skill/atk/line_3.prefab index f79bb323..daa171b1 100644 --- a/assets/resources/game/skill/atk/line_3.prefab +++ b/assets/resources/game/skill/atk/line_3.prefab @@ -173,7 +173,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@a194b", + "__uuid__": "36b5c30d-a1d9-4bd5-b45e-63b26995d026@d8028", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -254,12 +254,12 @@ "playOnLoad": true, "_clips": [ { - "__uuid__": "233b7e98-55a4-429e-9941-55177101a5ad", + "__uuid__": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "233b7e98-55a4-429e-9941-55177101a5ad", + "__uuid__": "e4ff9dbb-37f1-49d6-b656-b42ceb67f1a7", "__expectedType__": "cc.AnimationClip" }, "_id": "" diff --git a/assets/resources/game/skill/atk/line_3.prefab.meta b/assets/resources/game/skill/atk/line_3.prefab.meta index c1c4e099..944a3633 100644 --- a/assets/resources/game/skill/atk/line_3.prefab.meta +++ b/assets/resources/game/skill/atk/line_3.prefab.meta @@ -2,7 +2,7 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "2b7fa972-969e-4bf6-903c-2e8fa9403c01", + "uuid": "9233eed2-e912-4824-9830-509aa8f76410", "files": [ ".json" ], diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index 11365a72..2d53bd64 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -198,38 +198,38 @@ export const SkillUpList = { * */ export const SkillSet: Record = { - /** ========== 单体攻击基础技能 ========== - * 6001 战士用单体攻击 - * 6002 光箭蓝 溅射，分裂取向，一定概率分裂多个 - * 6003 光箭红 暴击取向 - * 6004 光箭绿 辅助类角色单体攻击 - * 6005 光箭黄 击晕取向 + /** ========== 单体攻击基础技能 ========== 升级方向是 最多向 3 个目标发射技能实体 + * 6001 火球 基础攻击 暴击取向 + * 6002 紫球 带毒向 + * 6003 白球 击晕取向 + * 6004 水球 溅射 分裂取向，一定概率分裂多个 + * 6005 风球 风怒取向 * 6008 箭矢 单体攻击， * 6009 箭矢蓝 溅射，分裂取向，一定概率分裂多个 * 6010 箭矢黄 击晕取向 **/ 6001: { - uuid: 6001, name: "普通攻击", sp_name: "atk_c2", icon: "1026", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", + uuid: 6001, name: "火球", sp_name: "atk_1", icon: "1026", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, RType: RType.linear, EType: EType.collision, info: "造成攻击力100%的伤害", }, 6002: { - uuid: 6002, name: "光箭蓝", sp_name: "atk_c1", icon: "1126", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", + uuid: 6002, name: "紫烟", sp_name: "atk_2", icon: "1126", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.3, speed: 720, with: 90, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote, RType: RType.linear, EType: EType.collision, info: "近战普通攻击技能", }, 6003: { - uuid: 6003, name: "光箭红", sp_name: "atk_c2", icon: "1126", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", + uuid: 6003, name: "白球", sp_name: "atk_3", icon: "1126", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.3, speed: 720, with: 90, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote, RType: RType.linear, EType: EType.collision, info: "一定几率暴击", }, 6004: { - uuid: 6004, name: "光箭绿", sp_name: "atk_c3", icon: "1126", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", + uuid: 6004, name: "水球", sp_name: "atk_4", icon: "1126", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.3, speed: 720, with: 90, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote, RType: RType.linear, EType: EType.collision, info: "普通远程攻击", }, 6005: { - uuid: 6005, name: "光箭黄", sp_name: "atk_c4", icon: "1126", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", + uuid: 6005, name: "风球", sp_name: "atk_5", icon: "1126", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.3, speed: 720, with: 90, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote, RType: RType.linear, EType: EType.collision, info: "普通远程攻击", }, @@ -251,47 +251,48 @@ export const SkillSet: Record = { RType: RType.bezier, EType: EType.collision, bezier_start_y: 20, bezier_mid_y: 140, bezier_arc: 1.05, info: "造成攻击力100%的伤害", }, /*** ======中阶范围攻击技能 ==== - * 都带有穿刺属性，至少穿刺2，英雄升级穿刺个数更多 - * 6101 光球 暴击取向 - * 6102 火球 击晕取向 - * 6103 暗影球 上毒取向 - * 6104 水球 溅射取向，溅射6002光箭蓝 + * 都带有穿刺属性，至少穿透1 个目标 攻击2 个目标， 升级方向是 最多 穿透3 个攻击 4 个目标 + * 6101 火球 基础属性，暴击取向 + * 6102 暗影球 毒取向 + * 6103 光球 击晕取向 + * 6104 水球 溅射：分裂多个 * 6105 风球 风怒取向 **/ 6101: { - uuid: 6101, name: "光球", sp_name: "line_1", icon: "1126", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", + uuid: 6101, name: "大火球", sp_name: "line_1", icon: "1126", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", DTType: DTType.single, stun: 0, ap: 100, hit_count: 2, hitcd: 0.3, speed: 720, with: 90, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote, RType: RType.linear, EType: EType.collision, info: "造成攻击力100%的伤害,一定几率暴击，高阶技能", }, + //怪物法师统一使用 暗影球 6102: { - uuid: 6102, name: "火球", sp_name: "line_3", icon: "1126", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", + uuid: 6102, name: "大紫球", sp_name: "line_2", icon: "1126", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", DTType: DTType.single, ap: 100, hit_count: 2, hitcd: 0.3, speed: 720, with: 90, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote, RType: RType.linear, EType: EType.collision, info: "造成攻击力100%的伤害，高阶技能", }, - //怪物法师统一使用 暗影球 + 6103: { - uuid: 6103, name: "暗影球", sp_name: "line_2", icon: "1126", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", + uuid: 6103, name: "大白球", sp_name: "line_3", icon: "1126", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", DTType: DTType.single, ap: 100, hit_count: 2, hitcd: 0.3, speed: 720, with: 90, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote, RType: RType.linear, EType: EType.collision, info: "造成攻击力100%的伤害，一定几率上毒（后期加入），高阶技能 ", }, 6104: { - uuid: 6104, name: "水球", sp_name: "line_4", icon: "1135", TGroup: TGroup.Enemy, readyAnm: "yellow", endAnm: "", act: "max", + uuid: 6104, name: "大水球", sp_name: "line_4", icon: "1135", TGroup: TGroup.Enemy, readyAnm: "yellow", endAnm: "", act: "max", DTType: DTType.single, crt: 20, ap: 100, hit_count: 2, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote, RType: RType.linear, EType: EType.collision, info: "射出强力箭矢，最多穿透6个敌人，附带20%额外暴击率", }, 6105: { - uuid: 6105, name: "风球", sp_name: "line_5", icon: "1173", TGroup: TGroup.Enemy, readyAnm: "blues", endAnm: "", act: "max", + uuid: 6105, name: "大风球", sp_name: "line_5", icon: "1173", TGroup: TGroup.Enemy, readyAnm: "blues", endAnm: "", act: "max", DTType: DTType.range, stun: 0, ap: 150, hit_count: 2, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote, RType: RType.fixedEnd, EType: EType.animationEnd, info: "召唤雷爆攻击一排的敌人,有概率击晕", }, /*** ======高阶范围攻击技能 ==== - * 都是3*3 范围攻击 + * 都是3*3 范围攻击 不是英雄技能，是技能卡专属的 常驻战斗技能， * 6201 雷墙 击晕向 * 6202 火墙 暴击向 - * 6203 风 - * 6204 水墙 - * 6205 风墙 - * 6206 陨石术 + * 6203 风 多段攻击 + * 6204 水墙 多段攻击 + * 6205 风墙 多段攻击 + * 6206 陨石术 暴击向 **/ 6201: { uuid: 6201, name: "雷墙", sp_name: "box_1", icon: "1173", TGroup: TGroup.Enemy, readyAnm: "blues", endAnm: "", act: "max", @@ -341,7 +342,7 @@ export const SkillSet: Record = { }, 6303: { uuid: 6303, name: "获取金币", sp_name: "buff_wind", icon: "1255", TGroup: TGroup.Self, readyAnm: "up_blue", endAnm: "gold", act: "atk", - DTType: DTType.single, kind: SkillKind.Gold, ap: 0, gold: 10, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.support, + DTType: DTType.single, kind: SkillKind.Gold, ap: 0, gold: 1, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.support, RType: RType.fixed, EType: EType.animationEnd, info: "增加一定数量的金币", }, //==========================buff 技能===================== @@ -429,23 +430,23 @@ export interface FieldSkillConfig { } export const FieldSkillSet: Record = { - 7001: { uuid: 7001, name: "召唤强化", type: FieldSkillType.SummonCount, value: 1, info: "召唤触发技能次数+1" }, - 7002: { uuid: 7002, name: "死亡强化", type: FieldSkillType.DeadCount, value: 1, info: "死亡触发技能次数+1" }, - 7003: { uuid: 7003, name: "开场强化", type: FieldSkillType.StartCount, value: 1, info: "战斗开始触发技能次数+1" }, - 7004: { uuid: 7004, name: "结束强化", type: FieldSkillType.EndCount, value: 1, info: "战斗结束触发技能次数+1" }, - 7005: { uuid: 7005, name: "金币收益", type: FieldSkillType.WaveGold, value: 10, info: "每回合金币收益+10" }, - 7006: { uuid: 7006, name: "出售强化", type: FieldSkillType.SellGold, value: 5, info: "卖出英雄金币+5" }, - 7007: { uuid: 7007, name: "战后恢复", type: FieldSkillType.WaveHeal, value: 0.3, info: "战斗结束生命回复量+30%" }, - 7008: { uuid: 7008, name: "攻击加成", type: FieldSkillType.HeroAtk, value: 0.2, info: "英雄攻击力+20%" }, - 7009: { uuid: 7009, name: "击晕加成", type: FieldSkillType.HeroStun, value: 0.1, info: "英雄击晕概率+10%" }, - 7010: { uuid: 7010, name: "暴击加成", type: FieldSkillType.HeroCrit, value: 0.1, info: "英雄暴击率+10%" }, - 7011: { uuid: 7011, name: "暴伤加成", type: FieldSkillType.HeroCritDamage, value: 0.5, info: "英雄暴击伤害+50%" }, - 7012: { uuid: 7012, name: "攻速加成", type: FieldSkillType.HeroSpeed, value: 0.2, info: "英雄攻击速度+20%" }, + 7001: { uuid: 7001, name: "召唤强化", type: FieldSkillType.SummonCount, value: 1, info: "召唤触发技能次数+1" }, //15 波技能 + 7002: { uuid: 7002, name: "死亡强化", type: FieldSkillType.DeadCount, value: 1, info: "死亡触发技能次数+1" }, //15 波技能 + 7003: { uuid: 7003, name: "开场强化", type: FieldSkillType.StartCount, value: 1, info: "战斗开始触发技能次数+1" }, //15 波技能 + 7004: { uuid: 7004, name: "结束强化", type: FieldSkillType.EndCount, value: 1, info: "战斗结束触发技能次数+1" }, //15 波技能 + 7005: { uuid: 7005, name: "金币收益", type: FieldSkillType.WaveGold, value: 1, info: "每回合金币收益+1" }, //1 波技能 + 7006: { uuid: 7006, name: "出售强化", type: FieldSkillType.SellGold, value: 1, info: "卖出英雄金币+1" }, //1 波技能 + 7007: { uuid: 7007, name: "战后恢复", type: FieldSkillType.WaveHeal, value: 0.1, info: "战斗结束生命回复量+10%" }, //1 波技能 + 7008: { uuid: 7008, name: "攻击加成", type: FieldSkillType.HeroAtk, value: 0.1, info: "英雄攻击力+10%" }, //10 波技能 + 7009: { uuid: 7009, name: "击晕加成", type: FieldSkillType.HeroStun, value: 0.1, info: "英雄击晕概率+10%" }, //10 波技能 + 7010: { uuid: 7010, name: "暴击加成", type: FieldSkillType.HeroCrit, value: 0.1, info: "英雄暴击率+10%" }, //10 波技能 + 7011: { uuid: 7011, name: "暴伤加成", type: FieldSkillType.HeroCritDamage, value: 0.2, info: "英雄暴击伤害+20%" }, //10 波技能 + 7012: { uuid: 7012, name: "攻速加成", type: FieldSkillType.HeroSpeed, value: 0.1, info: "英雄攻击速度+10%" }, //10 波技能 // ---- 13~18 来自原 TalentSet，统一为驻场百分比 / 绝对值口径 ---- // 出售返还由原生 SellGold 承担，SellBonus 不再单独配置 - 7013: { uuid: 7013, name: "购买优惠", type: FieldSkillType.BuyDiscount, value: 1, info: "购买卡牌费用-1金币" }, - 7014: { uuid: 7014, name: "刷新优惠", type: FieldSkillType.RefreshDiscount, value: 1, info: "刷新卡牌费用-1金币" }, - 7016: { uuid: 7016, name: "生命加成", type: FieldSkillType.HeroHp, value: 0.1, info: "英雄最大生命+10%" }, - 7017: { uuid: 7017, name: "风怒加成", type: FieldSkillType.HeroWindFury, value: 0.1, info: "英雄风怒概率+10%" }, - 7018: { uuid: 7018, name: "穿刺加成", type: FieldSkillType.HeroPuncture, value: 0.1, info: "英雄穿刺概率+10%" }, + 7013: { uuid: 7013, name: "购买优惠", type: FieldSkillType.BuyDiscount, value: 1, info: "购买卡牌费用-1金币" }, //10 波技能 + 7014: { uuid: 7014, name: "刷新优惠", type: FieldSkillType.RefreshDiscount, value: 1, info: "刷新卡牌费用-1金币" }, //10 波技能 + 7016: { uuid: 7016, name: "生命加成", type: FieldSkillType.HeroHp, value: 0.1, info: "英雄最大生命+10%" }, //10 波技能 + 7017: { uuid: 7017, name: "风怒加成", type: FieldSkillType.HeroWindFury, value: 0.1, info: "英雄风怒概率+10%" }, //10 波技能 + 7018: { uuid: 7018, name: "穿刺加成", type: FieldSkillType.HeroPuncture, value: 0.1, info: "英雄穿刺概率+10%" }, //10 波技能 };