From c3ddc16d407aa6540930d5b5080916627b912d88 Mon Sep 17 00:00:00 2001 From: panFD Date: Sun, 16 Aug 2026 19:44:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(skill):=20=E6=96=B0=E5=A2=9E=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E6=8A=80=E8=83=BDprefab=E5=B9=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增fb-6、maxa1、maxa2、maxm1、maxm2共5个技能prefab，优化aw1/aw2/aw3的节点缩放、尺寸和碰撞参数，新增技能属性字段，并在SkillSet中添加6019、6101、6109、6110四个技能配置，修复原有技能名称错误。 --- assets/resources/game/skill/atk/aw1.prefab | 22 +- assets/resources/game/skill/atk/aw2.prefab | 29 +- assets/resources/game/skill/atk/aw3.prefab | 22 +- assets/resources/game/skill/atk/fb-6.prefab | 516 ++++++++++++++++++ .../{bm-1.prefab.meta => fb-6.prefab.meta} | 2 +- assets/resources/game/skill/atk/maxa1.prefab | 383 +++++++++++++ .../game/skill/atk/maxa1.prefab.meta | 13 + assets/resources/game/skill/atk/maxa2.prefab | 383 +++++++++++++ .../game/skill/atk/maxa2.prefab.meta | 13 + .../skill/atk/{max1.prefab => maxm1.prefab} | 4 +- .../{max1.prefab.meta => maxm1.prefab.meta} | 2 +- .../skill/atk/{bm-1.prefab => maxm2.prefab} | 8 +- .../game/skill/atk/maxm2.prefab.meta | 13 + assets/script/game/common/config/SkillSet.ts | 24 +- 14 files changed, 1396 insertions(+), 38 deletions(-) create mode 100644 assets/resources/game/skill/atk/fb-6.prefab rename assets/resources/game/skill/atk/{bm-1.prefab.meta => fb-6.prefab.meta} (87%) create mode 100644 assets/resources/game/skill/atk/maxa1.prefab create mode 100644 assets/resources/game/skill/atk/maxa1.prefab.meta create mode 100644 assets/resources/game/skill/atk/maxa2.prefab create mode 100644 assets/resources/game/skill/atk/maxa2.prefab.meta rename assets/resources/game/skill/atk/{max1.prefab => maxm1.prefab} (99%) rename assets/resources/game/skill/atk/{max1.prefab.meta => maxm1.prefab.meta} (86%) rename assets/resources/game/skill/atk/{bm-1.prefab => maxm2.prefab} (98%) create mode 100644 assets/resources/game/skill/atk/maxm2.prefab.meta diff --git a/assets/resources/game/skill/atk/aw1.prefab b/assets/resources/game/skill/atk/aw1.prefab index 42468f1b..e93ce313 100644 --- a/assets/resources/game/skill/atk/aw1.prefab +++ b/assets/resources/game/skill/atk/aw1.prefab @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.5, - "y": 0.5, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -136,8 +136,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 78, - "height": 28 + "width": 26, + "height": 9.333333 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -181,7 +181,7 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -228,8 +228,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 40, - "height": 10 + "width": 20, + "height": 20 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -290,6 +290,10 @@ "speed": 720, "time": 0, "distance": 0, + "forceStartX": -1, + "forceStartY": -1, + "summon_count": 1, + "height_offset": 0, "_id": "" }, { @@ -355,8 +359,8 @@ }, "_size": { "__type__": "cc.Size", - "width": 30, - "height": 10 + "width": 20, + "height": 100 }, "_id": "" }, diff --git a/assets/resources/game/skill/atk/aw2.prefab b/assets/resources/game/skill/atk/aw2.prefab index 4e379a2f..886c37b9 100644 --- a/assets/resources/game/skill/atk/aw2.prefab +++ b/assets/resources/game/skill/atk/aw2.prefab @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.5, - "y": 0.5, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -136,8 +136,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 80, - "height": 28 + "width": 20, + "height": 7 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -178,7 +178,7 @@ }, "_type": 1, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -225,8 +225,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 40, - "height": 10 + "width": 20, + "height": 20 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -282,11 +282,16 @@ }, "atk_x": 10, "atk_y": 25, - "_id": "", "runType": 1, "endType": 2, "speed": 720, - "time": 0 + "time": 0, + "distance": 0, + "forceStartX": -1, + "forceStartY": -1, + "summon_count": 1, + "height_offset": 0, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -351,8 +356,8 @@ }, "_size": { "__type__": "cc.Size", - "width": 30, - "height": 10 + "width": 20, + "height": 100 }, "_id": "" }, @@ -372,4 +377,4 @@ "instance": null, "targetOverrides": null } -] +] \ No newline at end of file diff --git a/assets/resources/game/skill/atk/aw3.prefab b/assets/resources/game/skill/atk/aw3.prefab index 4ca18ff3..a4361a1f 100644 --- a/assets/resources/game/skill/atk/aw3.prefab +++ b/assets/resources/game/skill/atk/aw3.prefab @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.5, - "y": 0.5, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -136,8 +136,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 80, - "height": 28 + "width": 20, + "height": 7 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -181,7 +181,7 @@ }, "_type": 1, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -228,8 +228,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 40, - "height": 10 + "width": 20, + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -290,6 +290,10 @@ "speed": 720, "time": 0, "distance": 0, + "forceStartX": -1, + "forceStartY": -1, + "summon_count": 1, + "height_offset": 0, "_id": "" }, { @@ -355,8 +359,8 @@ }, "_size": { "__type__": "cc.Size", - "width": 30, - "height": 10 + "width": 20, + "height": 100 }, "_id": "" }, diff --git a/assets/resources/game/skill/atk/fb-6.prefab b/assets/resources/game/skill/atk/fb-6.prefab new file mode 100644 index 00000000..fdd69418 --- /dev/null +++ b/assets/resources/game/skill/atk/fb-6.prefab @@ -0,0 +1,516 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "fb-6", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "fb-6", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + }, + { + "__id__": 8 + } + ], + "_active": true, + "_components": [ + { + "__id__": 14 + }, + { + "__id__": 16 + }, + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 + } + ], + "_prefab": { + "__id__": 24 + }, + "_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": 0.8, + "y": 0.8, + "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, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": -0.5, + "y": 0.5, + "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": 277, + "height": 250 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_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__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@260b5", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20", + "__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.Node", + "_name": "Node-001", + "_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": -0.5, + "y": 0.5, + "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": 122, + "height": 68 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4blcTDlixIRI3qtyERLs2E" + }, + { + "__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": "e6QtagQwZA/50lsdWvOjb0" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "ed54OCubBD853t6+5pUPLQ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 50, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "57aabs7TE1J5obTAZczc+64", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "atk_x": 0, + "atk_y": 0, + "runType": 0, + "endType": 2, + "speed": 720, + "time": 0, + "distance": 0, + "forceStartX": -1, + "forceStartY": -1, + "summon_count": 1, + "height_offset": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35nW0iQNBH2bqkWAr3MVkQ" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "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": "57cr7S0YpK4oEZCavwXtIX" + }, + { + "__type__": "cc.BoxCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "tag": 0, + "_group": 1, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 0, + "y": 50 + }, + "_size": { + "__type__": "cc.Size", + "width": 50, + "height": 100 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ebw5mObxNGGKxnJXDgX5gl" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 23 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "a71379d4-b14d-4070-96ee-e7c889f25bbd", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "a71379d4-b14d-4070-96ee-e7c889f25bbd", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "20U0hP/NZErJJXRCEib1lq" + }, + { + "__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/bm-1.prefab.meta b/assets/resources/game/skill/atk/fb-6.prefab.meta similarity index 87% rename from assets/resources/game/skill/atk/bm-1.prefab.meta rename to assets/resources/game/skill/atk/fb-6.prefab.meta index 01d66444..07974771 100644 --- a/assets/resources/game/skill/atk/bm-1.prefab.meta +++ b/assets/resources/game/skill/atk/fb-6.prefab.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "syncNodeName": "bm-1" + "syncNodeName": "fb-6" } } diff --git a/assets/resources/game/skill/atk/maxa1.prefab b/assets/resources/game/skill/atk/maxa1.prefab new file mode 100644 index 00000000..94064e2b --- /dev/null +++ b/assets/resources/game/skill/atk/maxa1.prefab @@ -0,0 +1,383 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "maxa1", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "maxa1", + "_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, + "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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 30, + "height": 10 + }, + "_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": { + "__uuid__": "0f38817f-a8df-4547-8b37-e7ed29de8216", + "__expectedType__": "cc.Material" + }, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "abc35b6e-b052-4835-a3a3-cb85abd47f4d@a466d", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "abc35b6e-b052-4835-a3a3-cb85abd47f4d", + "__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": 20, + "height": 20 + }, + "_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__": "a6568e30-fa37-4afc-990f-34caeafc39b6", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "a6568e30-fa37-4afc-990f-34caeafc39b6", + "__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": 25, + "runType": 1, + "endType": 2, + "speed": 720, + "time": 0, + "distance": 0, + "forceStartX": -1, + "forceStartY": -1, + "summon_count": 4, + "height_offset": 5, + "_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": 20, + "height": 100 + }, + "_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/maxa1.prefab.meta b/assets/resources/game/skill/atk/maxa1.prefab.meta new file mode 100644 index 00000000..4225acb2 --- /dev/null +++ b/assets/resources/game/skill/atk/maxa1.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "3132c011-56bc-44ec-87aa-61049ce3b542", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "maxa1" + } +} diff --git a/assets/resources/game/skill/atk/maxa2.prefab b/assets/resources/game/skill/atk/maxa2.prefab new file mode 100644 index 00000000..63cbb599 --- /dev/null +++ b/assets/resources/game/skill/atk/maxa2.prefab @@ -0,0 +1,383 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "maxa2", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "maxa2", + "_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, + "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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 30, + "height": 10 + }, + "_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": { + "__uuid__": "2fcd55a9-38ca-45aa-9164-68e48aaf51ce", + "__expectedType__": "cc.Material" + }, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "abc35b6e-b052-4835-a3a3-cb85abd47f4d@14b64", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "abc35b6e-b052-4835-a3a3-cb85abd47f4d", + "__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": 20, + "height": 100 + }, + "_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__": "95855eab-60a2-46a7-a14f-f54d392cbf92", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "95855eab-60a2-46a7-a14f-f54d392cbf92", + "__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": 25, + "runType": 1, + "endType": 2, + "speed": 720, + "time": 0, + "distance": 0, + "forceStartX": -1, + "forceStartY": -1, + "summon_count": 6, + "height_offset": 0, + "_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": 20, + "height": 100 + }, + "_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/maxa2.prefab.meta b/assets/resources/game/skill/atk/maxa2.prefab.meta new file mode 100644 index 00000000..11262582 --- /dev/null +++ b/assets/resources/game/skill/atk/maxa2.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "8b315f47-10a3-4825-889d-f1787c61914d", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "maxa2" + } +} diff --git a/assets/resources/game/skill/atk/max1.prefab b/assets/resources/game/skill/atk/maxm1.prefab similarity index 99% rename from assets/resources/game/skill/atk/max1.prefab rename to assets/resources/game/skill/atk/maxm1.prefab index 562e695d..14957ddf 100644 --- a/assets/resources/game/skill/atk/max1.prefab +++ b/assets/resources/game/skill/atk/maxm1.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "max1", + "_name": "maxm1", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "max1", + "_name": "maxm1", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, diff --git a/assets/resources/game/skill/atk/max1.prefab.meta b/assets/resources/game/skill/atk/maxm1.prefab.meta similarity index 86% rename from assets/resources/game/skill/atk/max1.prefab.meta rename to assets/resources/game/skill/atk/maxm1.prefab.meta index aada103a..6e295bb7 100644 --- a/assets/resources/game/skill/atk/max1.prefab.meta +++ b/assets/resources/game/skill/atk/maxm1.prefab.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "syncNodeName": "max1" + "syncNodeName": "maxm1" } } diff --git a/assets/resources/game/skill/atk/bm-1.prefab b/assets/resources/game/skill/atk/maxm2.prefab similarity index 98% rename from assets/resources/game/skill/atk/bm-1.prefab rename to assets/resources/game/skill/atk/maxm2.prefab index 23044df8..120e3cef 100644 --- a/assets/resources/game/skill/atk/bm-1.prefab +++ b/assets/resources/game/skill/atk/maxm2.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "bm-1", + "_name": "maxm2", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "bm-1", + "_name": "maxm2", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -394,6 +394,10 @@ "speed": 720, "time": 0, "distance": 0, + "forceStartX": -1, + "forceStartY": -1, + "summon_count": 3, + "height_offset": 0, "_id": "" }, { diff --git a/assets/resources/game/skill/atk/maxm2.prefab.meta b/assets/resources/game/skill/atk/maxm2.prefab.meta new file mode 100644 index 00000000..99705a4d --- /dev/null +++ b/assets/resources/game/skill/atk/maxm2.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "7deda08b-4b48-4df4-80d2-87a8fafe253f", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "maxm2" + } +} diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index 31011f48..1af4995f 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -299,10 +299,19 @@ export const SkillSet: Record = { 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.bezier, EType: EType.collision, info: "造成攻击力100%的伤害", }, - + 6019: { + uuid: 6019, name: "飓风", sp_name: "fb-6", icon: "Stat_Mana", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "max1", + 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%的伤害, 高阶技能", + }, //大招 + 6101: { + uuid: 6101, name: "火焰喷射", sp_name: "maxm1", icon: "Stat_RangedAttack", 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.remote, + RType: RType.bezier, EType: EType.collision, bezier_start_y: 20, bezier_mid_y: 140, bezier_arc: 1.05, info: "造成攻击力100%的伤害", + }, 6102: { - uuid: 6102, name: "飓风", sp_name: "bm-1", icon: "Stat_Mana", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "max1", + uuid: 6102, name: "大飓风", sp_name: "maxm2", icon: "Stat_Mana", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "max1", 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%的伤害, 高阶技能", }, @@ -336,6 +345,17 @@ export const SkillSet: Record = { DTType: DTType.aoe_grid, stun: 0, ap: 300, hit_count: 6, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote, RType: RType.fixed, EType: EType.animationEnd, info: "召唤巨斧劈向前方敌人",//可以附加击晕增强 }, + 6109: { + uuid: 6019, name: "万箭齐发.冰", sp_name: "maxa1", icon: "Stat_RangedAttack", 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.remote, + RType: RType.bezier, EType: EType.collision, bezier_start_y: 20, bezier_mid_y: 140, bezier_arc: 1.05, info: "造成攻击力100%的伤害", + }, + 6110: { + uuid: 6110, name: "万箭齐发.火", sp_name: "maxa2", icon: "Stat_RangedAttack", 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.remote, + RType: RType.bezier, EType: EType.collision, bezier_start_y: 20, bezier_mid_y: 140, bezier_arc: 1.05, info: "造成攻击力100%的伤害", + }, + 6201: { uuid: 6201, name: "陨石术", sp_name: "fb-3", icon: "Stat_Tripleshot", TGroup: TGroup.Enemy, readyAnm: "blues", endAnm: "", act: "max1", DTType: DTType.aoe_grid, stun: 0, ap: 150, hit_count: 6, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.remote,