From afbaa13cb24e975bcd014a7e71e5a41742f4b872 Mon Sep 17 00:00:00 2001 From: panw Date: Tue, 4 Nov 2025 17:25:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E4=BD=9C=E4=BA=86=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=20=E8=BF=91=E6=88=98=E6=8A=80=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resources/game/skill/anm/atk02.anim | 136 +++++ .../resources/game/skill/anm/atk02.anim.meta | 13 + assets/resources/game/skill/anm/atk03.anim | 146 +++++ .../resources/game/skill/anm/atk03.anim.meta | 13 + assets/resources/game/skill/anm/atk04.anim | 151 +++++ .../resources/game/skill/anm/atk04.anim.meta | 13 + assets/resources/game/skill/anm/atk05.anim | 146 +++++ .../resources/game/skill/anm/atk05.anim.meta | 13 + assets/resources/game/skill/atk/atk_s1.prefab | 6 +- assets/resources/game/skill/atk/atk_s2.prefab | 364 +++++++++--- .../game/skill/atk/atk_s2.prefab.meta | 2 +- assets/resources/game/skill/atk/atk_s3.prefab | 546 +++++++++++++++++ .../game/skill/atk/atk_s3.prefab.meta | 13 + assets/resources/game/skill/atk/atk_s4.prefab | 549 ++++++++++++++++++ .../game/skill/atk/atk_s4.prefab.meta | 13 + assets/resources/game/skill/atk/atk_s5.prefab | 549 ++++++++++++++++++ .../game/skill/atk/atk_s5.prefab.meta | 13 + .../game/skill/atk/b_arrow_blue.prefab | 4 +- .../game/skill/atk/b_arrow_green.prefab | 4 +- .../game/skill/atk/b_arrow_red.prefab | 4 +- .../game/skill/atk/m_water_ball_1.prefab | 8 +- assets/script/Main.ts | 10 +- assets/script/game/common/config/SkillSet.ts | 2 +- assets/script/game/common/config/heroSet.ts | 2 +- assets/script/game/hero/HeroMove.ts | 2 +- assets/script/game/hero/HeroViewComp.ts | 2 +- assets/script/game/initialize/Initialize.ts | 2 +- assets/script/game/skill/Skill.ts | 25 +- 28 files changed, 2625 insertions(+), 126 deletions(-) create mode 100644 assets/resources/game/skill/anm/atk02.anim create mode 100644 assets/resources/game/skill/anm/atk02.anim.meta create mode 100644 assets/resources/game/skill/anm/atk03.anim create mode 100644 assets/resources/game/skill/anm/atk03.anim.meta create mode 100644 assets/resources/game/skill/anm/atk04.anim create mode 100644 assets/resources/game/skill/anm/atk04.anim.meta create mode 100644 assets/resources/game/skill/anm/atk05.anim create mode 100644 assets/resources/game/skill/anm/atk05.anim.meta create mode 100644 assets/resources/game/skill/atk/atk_s3.prefab create mode 100644 assets/resources/game/skill/atk/atk_s3.prefab.meta create mode 100644 assets/resources/game/skill/atk/atk_s4.prefab create mode 100644 assets/resources/game/skill/atk/atk_s4.prefab.meta create mode 100644 assets/resources/game/skill/atk/atk_s5.prefab create mode 100644 assets/resources/game/skill/atk/atk_s5.prefab.meta diff --git a/assets/resources/game/skill/anm/atk02.anim b/assets/resources/game/skill/anm/atk02.anim new file mode 100644 index 00000000..0e6dd21b --- /dev/null +++ b/assets/resources/game/skill/anm/atk02.anim @@ -0,0 +1,136 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "atk02", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 1, + "enableTrsBlending": false, + "_duration": 0.375, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [ + { + "frame": 0.20833333333333334, + "func": "", + "params": [] + }, + { + "frame": 0.20833333333333334, + "func": "atk", + "params": [] + } + ], + "_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.041666666666666664, + 0.08333333333333333, + 0.125, + 0.16666666666666666, + 0.20833333333333334, + 0.25, + 0.2916666666666667, + 0.3333333333333333 + ], + "_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" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@0cbf1", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@500e6", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@33fff", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__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" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skill/anm/atk02.anim.meta b/assets/resources/game/skill/anm/atk02.anim.meta new file mode 100644 index 00000000..b8638881 --- /dev/null +++ b/assets/resources/game/skill/anm/atk02.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "a57cbd2d-9cfe-4964-849d-d2c4f8fcb43f", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk02" + } +} diff --git a/assets/resources/game/skill/anm/atk03.anim b/assets/resources/game/skill/anm/atk03.anim new file mode 100644 index 00000000..c2cbeda8 --- /dev/null +++ b/assets/resources/game/skill/anm/atk03.anim @@ -0,0 +1,146 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "atk03", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 1, + "enableTrsBlending": false, + "_duration": 0.4583333333333333, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [ + { + "frame": 0.20833333333333334, + "func": "", + "params": [] + }, + { + "frame": 0.20833333333333334, + "func": "atk", + "params": [] + } + ], + "_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.041666666666666664, + 0.08333333333333333, + 0.125, + 0.16666666666666666, + 0.20833333333333334, + 0.25, + 0.2916666666666667, + 0.3333333333333333, + 0.375, + 0.4166666666666667 + ], + "_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" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@50d44", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@fc3f4", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@1bf03", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__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" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skill/anm/atk03.anim.meta b/assets/resources/game/skill/anm/atk03.anim.meta new file mode 100644 index 00000000..ec1d28cc --- /dev/null +++ b/assets/resources/game/skill/anm/atk03.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "10f8c6fc-b0da-476b-b356-d14fc5effc7e", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk03" + } +} diff --git a/assets/resources/game/skill/anm/atk04.anim b/assets/resources/game/skill/anm/atk04.anim new file mode 100644 index 00000000..f929f66d --- /dev/null +++ b/assets/resources/game/skill/anm/atk04.anim @@ -0,0 +1,151 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "atk04", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 1, + "enableTrsBlending": false, + "_duration": 0.5, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [ + { + "frame": 0.20833333333333334, + "func": "", + "params": [] + }, + { + "frame": 0.20833333333333334, + "func": "atk", + "params": [] + } + ], + "_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.041666666666666664, + 0.08333333333333333, + 0.125, + 0.16666666666666666, + 0.20833333333333334, + 0.25, + 0.2916666666666667, + 0.3333333333333333, + 0.375, + 0.4166666666666667, + 0.4583333333333333 + ], + "_values": [ + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@c1e30", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@f62e8", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@ac137", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@a99aa", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b753c", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b8d8f", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@77aba", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@82d97", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@57229", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@831ec", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@ce25f", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@e151b", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skill/anm/atk04.anim.meta b/assets/resources/game/skill/anm/atk04.anim.meta new file mode 100644 index 00000000..00450a6b --- /dev/null +++ b/assets/resources/game/skill/anm/atk04.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "3f4064bb-0208-4059-b117-4639abc24699", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk04" + } +} diff --git a/assets/resources/game/skill/anm/atk05.anim b/assets/resources/game/skill/anm/atk05.anim new file mode 100644 index 00000000..5221ca8f --- /dev/null +++ b/assets/resources/game/skill/anm/atk05.anim @@ -0,0 +1,146 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "atk05", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.4583333333333333, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [ + { + "frame": 0.20833333333333334, + "func": "", + "params": [] + }, + { + "frame": 0.20833333333333334, + "func": "atk", + "params": [] + } + ], + "_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.041666666666666664, + 0.08333333333333333, + 0.125, + 0.16666666666666666, + 0.20833333333333334, + 0.25, + 0.2916666666666667, + 0.3333333333333333, + 0.375, + 0.4166666666666667 + ], + "_values": [ + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@30608", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@b0b10", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@76298", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@76bd7", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@d4058", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@9197a", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@22801", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@76161", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@a8392", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@e2de4", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23@d96ab", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skill/anm/atk05.anim.meta b/assets/resources/game/skill/anm/atk05.anim.meta new file mode 100644 index 00000000..4a4635ca --- /dev/null +++ b/assets/resources/game/skill/anm/atk05.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "0a1b0645-ad63-4ae6-8bf3-2206c2be7b0b", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk05" + } +} diff --git a/assets/resources/game/skill/atk/atk_s1.prefab b/assets/resources/game/skill/atk/atk_s1.prefab index c5a74bea..55b35b83 100644 --- a/assets/resources/game/skill/atk/atk_s1.prefab +++ b/assets/resources/game/skill/atk/atk_s1.prefab @@ -505,7 +505,7 @@ "node": { "__id__": 1 }, - "_enabled": false, + "_enabled": true, "__prefab": { "__id__": 25 }, @@ -517,12 +517,12 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 40, + "x": 50, "y": 0 }, "_size": { "__type__": "cc.Size", - "width": 80, + "width": 100, "height": 100 }, "_id": "" diff --git a/assets/resources/game/skill/atk/atk_s2.prefab b/assets/resources/game/skill/atk/atk_s2.prefab index bf68e429..667aa3e4 100644 --- a/assets/resources/game/skill/atk/atk_s2.prefab +++ b/assets/resources/game/skill/atk/atk_s2.prefab @@ -20,22 +20,31 @@ "_children": [ { "__id__": 2 + }, + { + "__id__": 8 } ], "_active": true, "_components": [ - { - "__id__": 12 - }, - { - "__id__": 14 - }, { "__id__": 16 + }, + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 + }, + { + "__id__": 24 } ], "_prefab": { - "__id__": 18 + "__id__": 26 }, "_lpos": { "__type__": "cc.Vec3", @@ -82,21 +91,154 @@ }, { "__id__": 5 - }, - { - "__id__": 7 - }, - { - "__id__": 9 } ], "_prefab": { - "__id__": 11 + "__id__": 7 }, "_lpos": { "__type__": "cc.Vec3", + "x": -71.371, + "y": 46.797, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", "x": 0, "y": 0, + "z": -0.3826834323650898, + "w": 0.9238795325112867 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1.6, + "y": 1.6, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": -45 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 96, + "height": 96 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "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": null, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_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.Node", + "_name": "T", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 11 + }, + { + "__id__": 13 + } + ], + "_prefab": { + "__id__": 15 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 40, + "y": 0, "z": 0 }, "_lrot": { @@ -128,27 +270,27 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 4 + "__id__": 10 }, "_contentSize": { "__type__": "cc.Size", - "width": 60, - "height": 60 + "width": 80, + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.2, - "y": 0.2 + "x": 0.5, + "y": 0 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "93pNmvtQlLSqtTgIepyEmA" + "fileId": "8b9HY9QmBA5qB0sBawCFqZ" }, { "__type__": "cc.Sprite", @@ -156,11 +298,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 8 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 6 + "__id__": 12 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -170,9 +312,12 @@ "r": 255, "g": 255, "b": 255, - "a": 170 + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@46c83", + "__expectedType__": "cc.SpriteFrame" }, - "_spriteFrame": null, "_type": 0, "_fillType": 0, "_sizeMode": 0, @@ -185,83 +330,48 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23", - "__expectedType__": "cc.SpriteAtlas" - }, + "_atlas": null, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "12eKc8gltBz50frJCS5+ww" + "fileId": "e0lXniMh9C77aUoKhV9TG0" }, { - "__type__": "cc.RigidBody2D", + "__type__": "cc.Widget", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { "__id__": 8 }, - "enabledContactListener": false, - "bullet": false, - "awakeOnLoad": true, - "_group": 1, - "_type": 2, - "_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": "98cPYmJhNA4J/GZdhUWQGv" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, "_enabled": true, "__prefab": { - "__id__": 10 - }, - "tag": 0, - "_group": 1, - "_density": 1, - "_sensor": false, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 43.5, - "y": 48.5 - }, - "_size": { - "__type__": "cc.Size", - "width": 87, - "height": 97 + "__id__": 14 }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 25, + "_originalHeight": 25, + "_alignMode": 2, + "_lockFlags": 0, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "63V4BzNKRDzYi3gYIKcuRs" + "fileId": "efBhSYnd1Kz6YztMYe2EVs" }, { "__type__": "cc.PrefabInfo", @@ -271,7 +381,7 @@ "asset": { "__id__": 0 }, - "fileId": "3arqAMBz1MvoXBzeDaL5M/", + "fileId": "0b1uG2sstDMZRfqgTMWTrz", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -286,16 +396,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", - "width": 240, + "width": 80, "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0 }, "_id": "" @@ -314,17 +424,17 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 19 }, "playOnLoad": true, "_clips": [ { - "__uuid__": "45017156-064b-43f2-a24e-176b6ce17ad8", + "__uuid__": "a57cbd2d-9cfe-4964-849d-d2c4f8fcb43f", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "45017156-064b-43f2-a24e-176b6ce17ad8", + "__uuid__": "a57cbd2d-9cfe-4964-849d-d2c4f8fcb43f", "__expectedType__": "cc.AnimationClip" }, "_id": "" @@ -343,7 +453,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 21 }, "atk_x": 0, "atk_y": 0, @@ -351,7 +461,75 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "60LInmZXxDtKu79AshRG9j" + "fileId": "35nW0iQNBH2bqkWAr3MVkQ" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 23 + }, + "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__": 25 + }, + "tag": 0, + "_group": 1, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 50, + "y": 50 + }, + "_size": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ebw5mObxNGGKxnJXDgX5gl" }, { "__type__": "cc.PrefabInfo", diff --git a/assets/resources/game/skill/atk/atk_s2.prefab.meta b/assets/resources/game/skill/atk/atk_s2.prefab.meta index 1012592f..e7a117e7 100644 --- a/assets/resources/game/skill/atk/atk_s2.prefab.meta +++ b/assets/resources/game/skill/atk/atk_s2.prefab.meta @@ -2,7 +2,7 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "1845d312-7ffd-4895-9a55-60f662d7dedb", + "uuid": "6eddf0a1-6e95-442c-a912-bb63a2b6fcf0", "files": [ ".json" ], diff --git a/assets/resources/game/skill/atk/atk_s3.prefab b/assets/resources/game/skill/atk/atk_s3.prefab new file mode 100644 index 00000000..068bb3a8 --- /dev/null +++ b/assets/resources/game/skill/atk/atk_s3.prefab @@ -0,0 +1,546 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "atk_s3", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "atk_s3", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + }, + { + "__id__": 8 + } + ], + "_active": true, + "_components": [ + { + "__id__": 16 + }, + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 + }, + { + "__id__": 24 + } + ], + "_prefab": { + "__id__": 26 + }, + "_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": -71.371, + "y": 46.797, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": -0.3826834323650898, + "w": 0.9238795325112867 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1.4, + "y": 1.4, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": -45 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 96, + "height": 96 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "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": null, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_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.Node", + "_name": "T", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 11 + }, + { + "__id__": 13 + } + ], + "_prefab": { + "__id__": 15 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 40, + "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__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 80, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8b9HY9QmBA5qB0sBawCFqZ" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": false, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@46c83", + "__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": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e0lXniMh9C77aUoKhV9TG0" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 14 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 25, + "_originalHeight": 25, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "efBhSYnd1Kz6YztMYe2EVs" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "0b1uG2sstDMZRfqgTMWTrz", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 80, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "10f8c6fc-b0da-476b-b356-d14fc5effc7e", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "10f8c6fc-b0da-476b-b356-d14fc5effc7e", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c2RDvksalG2acL3tyGCY0t" + }, + { + "__type__": "57aabs7TE1J5obTAZczc+64", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "atk_x": 0, + "atk_y": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35nW0iQNBH2bqkWAr3MVkQ" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 23 + }, + "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__": 25 + }, + "tag": 0, + "_group": 1, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 50, + "y": 50 + }, + "_size": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ebw5mObxNGGKxnJXDgX5gl" + }, + { + "__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_s3.prefab.meta b/assets/resources/game/skill/atk/atk_s3.prefab.meta new file mode 100644 index 00000000..809d38bb --- /dev/null +++ b/assets/resources/game/skill/atk/atk_s3.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "f2f2b257-db39-452a-a002-ebe28fcb5232", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "atk_s3" + } +} diff --git a/assets/resources/game/skill/atk/atk_s4.prefab b/assets/resources/game/skill/atk/atk_s4.prefab new file mode 100644 index 00000000..11036f83 --- /dev/null +++ b/assets/resources/game/skill/atk/atk_s4.prefab @@ -0,0 +1,549 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "atk_s4", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "atk_s4", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + }, + { + "__id__": 8 + } + ], + "_active": true, + "_components": [ + { + "__id__": 16 + }, + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 + }, + { + "__id__": 24 + } + ], + "_prefab": { + "__id__": 26 + }, + "_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": 80.446, + "y": 8.345, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0.49999999999999994, + "w": 0.8660254037844387 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1.6, + "y": 1.6, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 60 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 96, + "height": 96 + }, + "_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__": "2423272e-e63b-4736-b15b-30b40cf98a23@c1e30", + "__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__": "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.Node", + "_name": "T", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 11 + }, + { + "__id__": 13 + } + ], + "_prefab": { + "__id__": 15 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 40, + "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__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 80, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8b9HY9QmBA5qB0sBawCFqZ" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": false, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@46c83", + "__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": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e0lXniMh9C77aUoKhV9TG0" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 14 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 25, + "_originalHeight": 25, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "efBhSYnd1Kz6YztMYe2EVs" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "0b1uG2sstDMZRfqgTMWTrz", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 80, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "3f4064bb-0208-4059-b117-4639abc24699", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "3f4064bb-0208-4059-b117-4639abc24699", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c2RDvksalG2acL3tyGCY0t" + }, + { + "__type__": "57aabs7TE1J5obTAZczc+64", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "atk_x": 0, + "atk_y": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35nW0iQNBH2bqkWAr3MVkQ" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 23 + }, + "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__": 25 + }, + "tag": 0, + "_group": 1, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 50, + "y": 50 + }, + "_size": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ebw5mObxNGGKxnJXDgX5gl" + }, + { + "__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_s4.prefab.meta b/assets/resources/game/skill/atk/atk_s4.prefab.meta new file mode 100644 index 00000000..00c91319 --- /dev/null +++ b/assets/resources/game/skill/atk/atk_s4.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "e2c178cf-bd86-4b40-8846-c40cc5e56fa8", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "atk_s4" + } +} diff --git a/assets/resources/game/skill/atk/atk_s5.prefab b/assets/resources/game/skill/atk/atk_s5.prefab new file mode 100644 index 00000000..8950e046 --- /dev/null +++ b/assets/resources/game/skill/atk/atk_s5.prefab @@ -0,0 +1,549 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "atk_s5", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "atk_s5", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + }, + { + "__id__": 8 + } + ], + "_active": true, + "_components": [ + { + "__id__": 16 + }, + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 + }, + { + "__id__": 24 + } + ], + "_prefab": { + "__id__": 26 + }, + "_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": 80.446, + "y": 8.345, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1.6, + "y": 1.6, + "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": 95, + "height": 48 + }, + "_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__": "2423272e-e63b-4736-b15b-30b40cf98a23@c1e30", + "__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__": "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.Node", + "_name": "T", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 11 + }, + { + "__id__": 13 + } + ], + "_prefab": { + "__id__": 15 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 40, + "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__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 80, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8b9HY9QmBA5qB0sBawCFqZ" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": false, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@46c83", + "__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": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e0lXniMh9C77aUoKhV9TG0" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 14 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 25, + "_originalHeight": 25, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "efBhSYnd1Kz6YztMYe2EVs" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "0b1uG2sstDMZRfqgTMWTrz", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 80, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "0a1b0645-ad63-4ae6-8bf3-2206c2be7b0b", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "0a1b0645-ad63-4ae6-8bf3-2206c2be7b0b", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c2RDvksalG2acL3tyGCY0t" + }, + { + "__type__": "57aabs7TE1J5obTAZczc+64", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "atk_x": 0, + "atk_y": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35nW0iQNBH2bqkWAr3MVkQ" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 23 + }, + "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__": 25 + }, + "tag": 0, + "_group": 1, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 50, + "y": 50 + }, + "_size": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ebw5mObxNGGKxnJXDgX5gl" + }, + { + "__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_s5.prefab.meta b/assets/resources/game/skill/atk/atk_s5.prefab.meta new file mode 100644 index 00000000..b24adb39 --- /dev/null +++ b/assets/resources/game/skill/atk/atk_s5.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "be2e1cd8-b17f-4648-9038-a471b6d268b0", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "atk_s5" + } +} diff --git a/assets/resources/game/skill/atk/b_arrow_blue.prefab b/assets/resources/game/skill/atk/b_arrow_blue.prefab index 83c509f5..d4e3904f 100644 --- a/assets/resources/game/skill/atk/b_arrow_blue.prefab +++ b/assets/resources/game/skill/atk/b_arrow_blue.prefab @@ -419,8 +419,8 @@ "__prefab": { "__id__": 19 }, - "atk_x": 0, - "atk_y": 0, + "atk_x": 10, + "atk_y": 30, "_id": "" }, { diff --git a/assets/resources/game/skill/atk/b_arrow_green.prefab b/assets/resources/game/skill/atk/b_arrow_green.prefab index a85a7f26..66ff8a8f 100644 --- a/assets/resources/game/skill/atk/b_arrow_green.prefab +++ b/assets/resources/game/skill/atk/b_arrow_green.prefab @@ -422,8 +422,8 @@ "__prefab": { "__id__": 19 }, - "atk_x": 0, - "atk_y": 0, + "atk_x": 10, + "atk_y": 30, "_id": "" }, { diff --git a/assets/resources/game/skill/atk/b_arrow_red.prefab b/assets/resources/game/skill/atk/b_arrow_red.prefab index f1062f5e..7b4dabd6 100644 --- a/assets/resources/game/skill/atk/b_arrow_red.prefab +++ b/assets/resources/game/skill/atk/b_arrow_red.prefab @@ -422,8 +422,8 @@ "__prefab": { "__id__": 19 }, - "atk_x": 0, - "atk_y": 0, + "atk_x": 10, + "atk_y": 30, "_id": "" }, { diff --git a/assets/resources/game/skill/atk/m_water_ball_1.prefab b/assets/resources/game/skill/atk/m_water_ball_1.prefab index c6786560..d63af816 100644 --- a/assets/resources/game/skill/atk/m_water_ball_1.prefab +++ b/assets/resources/game/skill/atk/m_water_ball_1.prefab @@ -58,8 +58,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.5, - "y": 0.5, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -280,8 +280,8 @@ "__prefab": { "__id__": 13 }, - "atk_x": 0, - "atk_y": 15, + "atk_x": 10, + "atk_y": 30, "_id": "" }, { diff --git a/assets/script/Main.ts b/assets/script/Main.ts index bb5c2a5b..4cae125c 100644 --- a/assets/script/Main.ts +++ b/assets/script/Main.ts @@ -12,11 +12,11 @@ const { ccclass, property } = _decorator; @ccclass('Main') export class Main extends Root { start() { - // PhysicsSystem2D.instance.debugDrawFlags = EPhysics2DDrawFlags.Aabb - // |EPhysics2DDrawFlags.Pair - // |EPhysics2DDrawFlags.CenterOfMass - // |EPhysics2DDrawFlags.Joint - // |EPhysics2DDrawFlags.Shape; + PhysicsSystem2D.instance.debugDrawFlags = EPhysics2DDrawFlags.Aabb + |EPhysics2DDrawFlags.Pair + |EPhysics2DDrawFlags.CenterOfMass + |EPhysics2DDrawFlags.Joint + |EPhysics2DDrawFlags.Shape; } protected async run() { smc.initialize = ecs.getEntity(Initialize); diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index c03238af..3e582793 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -156,7 +156,7 @@ export const SkillSet: Record = { buffs:[],neAttrs:[],info:"向最前方敌人扔出石斧,造成100%攻击的伤害", }, 6002: { - uuid:6002,name:"挥砍",sp_name:"atk_s2",icon:"3036",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,DType:DType.ATK, + uuid:6002,name:"挥砍",sp_name:"atk_s4",icon:"3036",TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,DType:DType.ATK, ap:100,cd:1,t_num:1,hit_num:1,hit:1,hitcd:0.2,speed:720,cost:0,with:0,dis:80,ready:0,EAnm:0,DAnm:9001,RType:RType.fixed,EType:EType.animationEnd, buffs:[],neAttrs:[],info:"向最前方敌人扔出石斧,造成100%攻击的伤害", }, diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index bdf64af0..496fcd64 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -110,7 +110,7 @@ export const HeroInfo: Record = { // 刘邦 - 领导型战士（善于用人，知人善任） 5001:{uuid:5001,name:"刘邦",path:"hk1", fac:FacSet.HERO, kind:1,as:1.5, - type:HType.warrior,lv:1,hp:1000,mp:85,map:10,def:9,mdef:0,ap:15,dis:100,speed:120,skills:[6001], + type:HType.warrior,lv:1,hp:1000,mp:85,map:10,def:9,mdef:0,ap:15,dis:100,speed:120,skills:[6002], buff:[],tal:[7101,7201,7301],info:"楚汉争霸领袖，领导统御型战士"}, // 荆轲 - 刺客（敏捷型，高速度和暴击率） diff --git a/assets/script/game/hero/HeroMove.ts b/assets/script/game/hero/HeroMove.ts index e3e53fa0..bfbcf85a 100644 --- a/assets/script/game/hero/HeroMove.ts +++ b/assets/script/game/hero/HeroMove.ts @@ -63,7 +63,7 @@ export class HeroMoveSystem extends ecs.ComblockSystem implements ecs.ISystemUpd // 英雄阵营特殊逻辑：根据职业区分行为 const hasEnemies = this.checkEnemiesExist(e); - const isWarrior = model.type === HType.warrior; + const isWarrior = model.type === HType.warrior||model.type===HType.assassin; // 战士职业：有敌人就向敌人前进 if (isWarrior && hasEnemies) { diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index c832959a..0718966b 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -218,7 +218,7 @@ export class HeroViewComp extends CCComp { var prefab: Prefab = oops.res.get(path, Prefab)!; var node = instantiate(prefab); node.setScale(node.scale.x * scale, node.scale.y); - node.setPosition(this.node.position.x, this.node.position.y+8, this.node.position.z); + node.setPosition(this.node.position.x, this.node.position.y+50, this.node.position.z); node.parent = this.node.parent; } diff --git a/assets/script/game/initialize/Initialize.ts b/assets/script/game/initialize/Initialize.ts index 65436909..bf0fa6e9 100644 --- a/assets/script/game/initialize/Initialize.ts +++ b/assets/script/game/initialize/Initialize.ts @@ -28,7 +28,7 @@ export class Initialize extends ecs.Entity { // 加载自定义资 this.loadCustom(queue); // 加载多语言包 - this.loadLanguage(queue); + // this.loadLanguage(queue); // 加载公共资源 this.loadCommon(queue); // 加载游戏内容加载进度提示界面 diff --git a/assets/script/game/skill/Skill.ts b/assets/script/game/skill/Skill.ts index 4ed1ea48..68a959da 100644 --- a/assets/script/game/skill/Skill.ts +++ b/assets/script/game/skill/Skill.ts @@ -1,6 +1,6 @@ -import { instantiate, Node, Prefab, v3, Vec3 } from "cc"; +import { BoxCollider2D, instantiate, Node, Prefab, v3, Vec3 } from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; -import { SkillSet } from "../common/config/SkillSet"; +import { EType, SkillSet } from "../common/config/SkillSet"; import { oops } from "db://oops-framework/core/Oops"; import { HeroAttrsComp } from "../hero/HeroAttrsComp"; @@ -50,23 +50,30 @@ export class Skill extends ecs.Entity { var scene = smc.map.MapView.scene; node.parent = scene.entityLayer!.node!.getChildByName("SKILL")!; // 设置节点属性 - node.setPosition(startPos); - - if(caster.node.scale.x < 0){ - node.setScale(v3(node.scale.x*-1,node.scale.y,1)) - } - + let face=caster.node.scale.x < 0 ? -1 : 1 + node.setScale(v3(node.scale.x*face,node.scale.y,1)) // 初始视图 const SView = node.getComponent(SkillView); + if(config.EType!=EType.collision){ + const collider=node.getComponent(BoxCollider2D); + if(collider){ + collider.enabled=false + } + } + // 只设置必要的运行时属性，配置信息通过 SkillSet[uuid] 访问 // 核心标识 SView.s_uuid= s_uuid SView.group= caster.box_group this.add(SView); - startPos.x=startPos.x+SView.atk_x + startPos.x=startPos.x+SView.atk_x*face startPos.y=startPos.y+SView.atk_y + + node.setPosition(startPos); + // 初始化移动组件 - 从SkillView获取移动参数 + const sMoveCom = this.get(SMoveDataComp); sMoveCom.startPos.set(startPos); sMoveCom.targetPos.set(targetPos);