From 9579c4f75ead6eda78050901f662007fcd5665ab Mon Sep 17 00:00:00 2001 From: panFD Date: Thu, 13 Aug 2026 23:05:51 +0800 Subject: [PATCH] =?UTF-8?q?refactor(monster):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E6=80=AA=E7=89=A9=E5=88=86=E5=B1=82=E6=98=BE=E7=A4=BA=E4=B8=8E?= =?UTF-8?q?=E6=88=98=E6=96=97=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 重构怪物挂载逻辑，按Boss/小怪分别挂载到对应场景层 2. 调整怪物出生落点逻辑，移除额外Y轴偏移 3. 优化场景节点清理范围，新增MON/BOSS层清理 4. 重构渲染排序逻辑，分层管理怪物渲染层级 5. 新增5套攻击技能预制体与动画资源 6. 修复技能配置参数冗余注释与类型错误 --- assets/resources/game/map/map_rpg.prefab | 30 +- .../resources/game/skill/anm/atk/atk01.anim | 85 +-- .../resources/game/skill/anm/atk/atk02.anim | 116 ++++ .../game/skill/anm/atk/atk02.anim.meta | 13 + .../resources/game/skill/anm/atk/atk03.anim | 116 ++++ .../game/skill/anm/atk/atk03.anim.meta | 13 + .../resources/game/skill/anm/atk/atk04.anim | 116 ++++ .../game/skill/anm/atk/atk04.anim.meta | 13 + .../resources/game/skill/anm/atk/atk05.anim | 116 ++++ .../game/skill/anm/atk/atk05.anim.meta | 13 + assets/resources/game/skill/atk/atk1.prefab | 372 +++++++++++ .../atk/{atk.prefab.meta => atk1.prefab.meta} | 2 +- .../skill/atk/{atk.prefab => atk2.prefab} | 14 +- .../resources/game/skill/atk/atk2.prefab.meta | 13 + assets/resources/game/skill/atk/atk3.prefab | 375 +++++++++++ .../resources/game/skill/atk/atk3.prefab.meta | 13 + assets/resources/game/skill/atk/atk4.prefab | 375 +++++++++++ .../resources/game/skill/atk/atk4.prefab.meta | 13 + assets/resources/game/skill/atk/atk5.prefab | 375 +++++++++++ .../resources/game/skill/atk/atk5.prefab.meta | 13 + .../resources/game/skill/buff/tooltip.prefab | 618 ++++++++++++++---- assets/script/game/common/config/SkillSet.ts | 16 +- assets/script/game/hero/Mon.ts | 5 +- assets/script/game/hero/MoveComp.ts | 37 +- assets/script/game/map/MissionComp.ts | 18 +- assets/script/game/map/MissionMonComp.ts | 2 +- 26 files changed, 2639 insertions(+), 253 deletions(-) create mode 100644 assets/resources/game/skill/anm/atk/atk02.anim create mode 100644 assets/resources/game/skill/anm/atk/atk02.anim.meta create mode 100644 assets/resources/game/skill/anm/atk/atk03.anim create mode 100644 assets/resources/game/skill/anm/atk/atk03.anim.meta create mode 100644 assets/resources/game/skill/anm/atk/atk04.anim create mode 100644 assets/resources/game/skill/anm/atk/atk04.anim.meta create mode 100644 assets/resources/game/skill/anm/atk/atk05.anim create mode 100644 assets/resources/game/skill/anm/atk/atk05.anim.meta create mode 100644 assets/resources/game/skill/atk/atk1.prefab rename assets/resources/game/skill/atk/{atk.prefab.meta => atk1.prefab.meta} (87%) rename assets/resources/game/skill/atk/{atk.prefab => atk2.prefab} (96%) create mode 100644 assets/resources/game/skill/atk/atk2.prefab.meta create mode 100644 assets/resources/game/skill/atk/atk3.prefab create mode 100644 assets/resources/game/skill/atk/atk3.prefab.meta create mode 100644 assets/resources/game/skill/atk/atk4.prefab create mode 100644 assets/resources/game/skill/atk/atk4.prefab.meta create mode 100644 assets/resources/game/skill/atk/atk5.prefab create mode 100644 assets/resources/game/skill/atk/atk5.prefab.meta diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index 46e03ff4..24a4b44c 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -8218,7 +8218,7 @@ }, { "__type__": "cc.Node", - "_name": "LINE2", + "_name": "BOSS", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -8289,7 +8289,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ea767WaZRHo4s0bZQfN8zP" + "fileId": "3fVB8r2UFAB5QujD6LOw6s" }, { "__type__": "cc.PrefabInfo", @@ -8299,14 +8299,14 @@ "asset": { "__id__": 0 }, - "fileId": "60UdPtJn9ALLHCveLwT1bT", + "fileId": "f4iFaXCXNKorfGJFH32POa", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "HERO", + "_name": "MON", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -8377,7 +8377,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "dasmpuTSVM7qA3QW9/3XjQ" + "fileId": "ea767WaZRHo4s0bZQfN8zP" }, { "__type__": "cc.PrefabInfo", @@ -8387,14 +8387,14 @@ "asset": { "__id__": 0 }, - "fileId": "eaiasKNEFO6qvodGhL4a0b", + "fileId": "60UdPtJn9ALLHCveLwT1bT", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "LINE1", + "_name": "HERO", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -8465,7 +8465,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b8C5CFg5lM4oUHMeSrc/sV" + "fileId": "dasmpuTSVM7qA3QW9/3XjQ" }, { "__type__": "cc.PrefabInfo", @@ -8475,14 +8475,14 @@ "asset": { "__id__": 0 }, - "fileId": "4dcNJaDM1CLI9q3fIqHZ/U", + "fileId": "eaiasKNEFO6qvodGhL4a0b", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "LINE3", + "_name": "LINE1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -8553,7 +8553,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "a5LMIIbHtOKK10K5do5dSQ" + "fileId": "b8C5CFg5lM4oUHMeSrc/sV" }, { "__type__": "cc.PrefabInfo", @@ -8563,14 +8563,14 @@ "asset": { "__id__": 0 }, - "fileId": "a6CBSkrzZIurlX0D/HzXDp", + "fileId": "4dcNJaDM1CLI9q3fIqHZ/U", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", - "_name": "BOOS", + "_name": "LINE3", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -8641,7 +8641,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "3fVB8r2UFAB5QujD6LOw6s" + "fileId": "a5LMIIbHtOKK10K5do5dSQ" }, { "__type__": "cc.PrefabInfo", @@ -8651,7 +8651,7 @@ "asset": { "__id__": 0 }, - "fileId": "f4iFaXCXNKorfGJFH32POa", + "fileId": "a6CBSkrzZIurlX0D/HzXDp", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null diff --git a/assets/resources/game/skill/anm/atk/atk01.anim b/assets/resources/game/skill/anm/atk/atk01.anim index 9f28b540..148d143b 100644 --- a/assets/resources/game/skill/anm/atk/atk01.anim +++ b/assets/resources/game/skill/anm/atk/atk01.anim @@ -11,103 +11,28 @@ "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.20833333333333334, + "_duration": 0, "_hash": 500763545, - "_tracks": [ - { - "__id__": 1 - } - ], + "_tracks": [], "_exoticAnimation": null, "_events": [ { - "frame": 0.3333333333333333, + "frame": 0.08333333333333333, "func": "", "params": [] }, { - "frame": 0.3333333333333333, + "frame": 0.08333333333333333, "func": "atk", "params": [] } ], "_embeddedPlayers": [], "_additiveSettings": { - "__id__": 7 + "__id__": 1 }, "_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 - ], - "_values": [ - { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@c9de1", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@1ebb0", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@0e5a2", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@360bd", - "__expectedType__": "cc.SpriteFrame" - } - ] - }, { "__type__": "cc.AnimationClipAdditiveSettings", "enabled": false, diff --git a/assets/resources/game/skill/anm/atk/atk02.anim b/assets/resources/game/skill/anm/atk/atk02.anim new file mode 100644 index 00000000..9c32540b --- /dev/null +++ b/assets/resources/game/skill/anm/atk/atk02.anim @@ -0,0 +1,116 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "atk01", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 1, + "enableTrsBlending": false, + "_duration": 0.20833333333333334, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [ + { + "frame": 0.08333333333333333, + "func": "", + "params": [] + }, + { + "frame": 0.08333333333333333, + "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 + ], + "_values": [ + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@c9de1", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@1ebb0", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@0e5a2", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@360bd", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skill/anm/atk/atk02.anim.meta b/assets/resources/game/skill/anm/atk/atk02.anim.meta new file mode 100644 index 00000000..9b99bc41 --- /dev/null +++ b/assets/resources/game/skill/anm/atk/atk02.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "6b9c9f74-0168-4b57-824d-bfcc2cd1785d", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk02" + } +} diff --git a/assets/resources/game/skill/anm/atk/atk03.anim b/assets/resources/game/skill/anm/atk/atk03.anim new file mode 100644 index 00000000..9c32540b --- /dev/null +++ b/assets/resources/game/skill/anm/atk/atk03.anim @@ -0,0 +1,116 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "atk01", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 1, + "enableTrsBlending": false, + "_duration": 0.20833333333333334, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [ + { + "frame": 0.08333333333333333, + "func": "", + "params": [] + }, + { + "frame": 0.08333333333333333, + "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 + ], + "_values": [ + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@c9de1", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@1ebb0", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@0e5a2", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@360bd", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skill/anm/atk/atk03.anim.meta b/assets/resources/game/skill/anm/atk/atk03.anim.meta new file mode 100644 index 00000000..936548a9 --- /dev/null +++ b/assets/resources/game/skill/anm/atk/atk03.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "26398731-5541-44ca-b2b7-4947dc9bf7f7", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk03" + } +} diff --git a/assets/resources/game/skill/anm/atk/atk04.anim b/assets/resources/game/skill/anm/atk/atk04.anim new file mode 100644 index 00000000..9c32540b --- /dev/null +++ b/assets/resources/game/skill/anm/atk/atk04.anim @@ -0,0 +1,116 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "atk01", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 1, + "enableTrsBlending": false, + "_duration": 0.20833333333333334, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [ + { + "frame": 0.08333333333333333, + "func": "", + "params": [] + }, + { + "frame": 0.08333333333333333, + "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 + ], + "_values": [ + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@c9de1", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@1ebb0", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@0e5a2", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@360bd", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skill/anm/atk/atk04.anim.meta b/assets/resources/game/skill/anm/atk/atk04.anim.meta new file mode 100644 index 00000000..0e1cd97f --- /dev/null +++ b/assets/resources/game/skill/anm/atk/atk04.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "0ad94bf2-3b2d-4f80-8500-68c5e33e2ed1", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk04" + } +} diff --git a/assets/resources/game/skill/anm/atk/atk05.anim b/assets/resources/game/skill/anm/atk/atk05.anim new file mode 100644 index 00000000..9c32540b --- /dev/null +++ b/assets/resources/game/skill/anm/atk/atk05.anim @@ -0,0 +1,116 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "atk01", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 1, + "enableTrsBlending": false, + "_duration": 0.20833333333333334, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [ + { + "frame": 0.08333333333333333, + "func": "", + "params": [] + }, + { + "frame": 0.08333333333333333, + "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 + ], + "_values": [ + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@c9de1", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@1ebb0", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@0e5a2", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@360bd", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skill/anm/atk/atk05.anim.meta b/assets/resources/game/skill/anm/atk/atk05.anim.meta new file mode 100644 index 00000000..8e515438 --- /dev/null +++ b/assets/resources/game/skill/anm/atk/atk05.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "ba0a95bf-2ea1-4d27-9c4f-cbd970ca558c", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk05" + } +} diff --git a/assets/resources/game/skill/atk/atk1.prefab b/assets/resources/game/skill/atk/atk1.prefab new file mode 100644 index 00000000..e50d784f --- /dev/null +++ b/assets/resources/game/skill/atk/atk1.prefab @@ -0,0 +1,372 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "atk1", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "atk1", + "_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.3, + "y": 1.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": 95, + "height": 96 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "93pNmvtQlLSqtTgIepyEmA" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 120 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "57aabs7TE1J5obTAZczc+64", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "atk_x": 20, + "atk_y": 40, + "runType": 2, + "endType": 0, + "speed": 720, + "time": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35nW0iQNBH2bqkWAr3MVkQ" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "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__": 15 + }, + "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": 120, + "height": 120 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ebw5mObxNGGKxnJXDgX5gl" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "45017156-064b-43f2-a24e-176b6ce17ad8", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "45017156-064b-43f2-a24e-176b6ce17ad8", + "__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/atk.prefab.meta b/assets/resources/game/skill/atk/atk1.prefab.meta similarity index 87% rename from assets/resources/game/skill/atk/atk.prefab.meta rename to assets/resources/game/skill/atk/atk1.prefab.meta index 582b9aed..9b2faa77 100644 --- a/assets/resources/game/skill/atk/atk.prefab.meta +++ b/assets/resources/game/skill/atk/atk1.prefab.meta @@ -8,6 +8,6 @@ ], "subMetas": {}, "userData": { - "syncNodeName": "atk" + "syncNodeName": "atk1" } } diff --git a/assets/resources/game/skill/atk/atk.prefab b/assets/resources/game/skill/atk/atk2.prefab similarity index 96% rename from assets/resources/game/skill/atk/atk.prefab rename to assets/resources/game/skill/atk/atk2.prefab index 1911a6fd..8ef20851 100644 --- a/assets/resources/game/skill/atk/atk.prefab +++ b/assets/resources/game/skill/atk/atk2.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "atk", + "_name": "atk2", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "atk", + "_name": "atk2", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -254,7 +254,7 @@ "atk_x": 20, "atk_y": 40, "runType": 2, - "endType": 2, + "endType": 0, "speed": 720, "time": 0, "_id": "" @@ -318,7 +318,7 @@ "_offset": { "__type__": "cc.Vec2", "x": 0, - "y": -0.1 + "y": 0 }, "_size": { "__type__": "cc.Size", @@ -343,15 +343,15 @@ "__prefab": { "__id__": 17 }, - "playOnLoad": false, + "playOnLoad": true, "_clips": [ { - "__uuid__": "45017156-064b-43f2-a24e-176b6ce17ad8", + "__uuid__": "6b9c9f74-0168-4b57-824d-bfcc2cd1785d", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "45017156-064b-43f2-a24e-176b6ce17ad8", + "__uuid__": "6b9c9f74-0168-4b57-824d-bfcc2cd1785d", "__expectedType__": "cc.AnimationClip" }, "_id": "" diff --git a/assets/resources/game/skill/atk/atk2.prefab.meta b/assets/resources/game/skill/atk/atk2.prefab.meta new file mode 100644 index 00000000..9fa7aa35 --- /dev/null +++ b/assets/resources/game/skill/atk/atk2.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "ff6e9a75-b1b9-448e-9cbd-d30de98fd21b", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "atk2" + } +} diff --git a/assets/resources/game/skill/atk/atk3.prefab b/assets/resources/game/skill/atk/atk3.prefab new file mode 100644 index 00000000..1b894da9 --- /dev/null +++ b/assets/resources/game/skill/atk/atk3.prefab @@ -0,0 +1,375 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "atk3", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "atk3", + "_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.3, + "y": 1.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": 95, + "height": 96 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "93pNmvtQlLSqtTgIepyEmA" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 120 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "57aabs7TE1J5obTAZczc+64", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "atk_x": 20, + "atk_y": 40, + "runType": 2, + "endType": 0, + "speed": 720, + "time": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35nW0iQNBH2bqkWAr3MVkQ" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "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__": 15 + }, + "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": 120, + "height": 120 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ebw5mObxNGGKxnJXDgX5gl" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "26398731-5541-44ca-b2b7-4947dc9bf7f7", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "26398731-5541-44ca-b2b7-4947dc9bf7f7", + "__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/atk3.prefab.meta b/assets/resources/game/skill/atk/atk3.prefab.meta new file mode 100644 index 00000000..96911a82 --- /dev/null +++ b/assets/resources/game/skill/atk/atk3.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "16ca6f33-f910-4202-add4-2862be6c9127", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "atk3" + } +} diff --git a/assets/resources/game/skill/atk/atk4.prefab b/assets/resources/game/skill/atk/atk4.prefab new file mode 100644 index 00000000..ff86b40d --- /dev/null +++ b/assets/resources/game/skill/atk/atk4.prefab @@ -0,0 +1,375 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "atk4", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "atk4", + "_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.3, + "y": 1.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": 95, + "height": 96 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "93pNmvtQlLSqtTgIepyEmA" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 120 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "57aabs7TE1J5obTAZczc+64", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "atk_x": 20, + "atk_y": 40, + "runType": 2, + "endType": 0, + "speed": 720, + "time": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35nW0iQNBH2bqkWAr3MVkQ" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "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__": 15 + }, + "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": 120, + "height": 120 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ebw5mObxNGGKxnJXDgX5gl" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "0ad94bf2-3b2d-4f80-8500-68c5e33e2ed1", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "0ad94bf2-3b2d-4f80-8500-68c5e33e2ed1", + "__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/atk4.prefab.meta b/assets/resources/game/skill/atk/atk4.prefab.meta new file mode 100644 index 00000000..b869817d --- /dev/null +++ b/assets/resources/game/skill/atk/atk4.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "7f30cd3c-57d1-476a-96bb-02c4eb082576", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "atk4" + } +} diff --git a/assets/resources/game/skill/atk/atk5.prefab b/assets/resources/game/skill/atk/atk5.prefab new file mode 100644 index 00000000..53a0f08c --- /dev/null +++ b/assets/resources/game/skill/atk/atk5.prefab @@ -0,0 +1,375 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "atk5", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "atk5", + "_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.3, + "y": 1.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": 95, + "height": 96 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "93pNmvtQlLSqtTgIepyEmA" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@3c745", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 120 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "57aabs7TE1J5obTAZczc+64", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "atk_x": 20, + "atk_y": 40, + "runType": 2, + "endType": 0, + "speed": 720, + "time": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35nW0iQNBH2bqkWAr3MVkQ" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "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__": 15 + }, + "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": 120, + "height": 120 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ebw5mObxNGGKxnJXDgX5gl" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "ba0a95bf-2ea1-4d27-9c4f-cbd970ca558c", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "ba0a95bf-2ea1-4d27-9c4f-cbd970ca558c", + "__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/atk5.prefab.meta b/assets/resources/game/skill/atk/atk5.prefab.meta new file mode 100644 index 00000000..06ce74bc --- /dev/null +++ b/assets/resources/game/skill/atk/atk5.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "7227b42b-9cc7-41bd-8858-9d05c4cc758b", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "atk5" + } +} diff --git a/assets/resources/game/skill/buff/tooltip.prefab b/assets/resources/game/skill/buff/tooltip.prefab index c4fc27fc..32ee84f9 100644 --- a/assets/resources/game/skill/buff/tooltip.prefab +++ b/assets/resources/game/skill/buff/tooltip.prefab @@ -34,32 +34,32 @@ "__id__": 82 }, { - "__id__": 288 + "__id__": 304 }, { - "__id__": 298 - }, - { - "__id__": 308 + "__id__": 314 }, { "__id__": 324 + }, + { + "__id__": 340 } ], "_active": true, "_components": [ { - "__id__": 340 + "__id__": 356 }, { - "__id__": 342 + "__id__": 358 }, { - "__id__": 344 + "__id__": 360 } ], "_prefab": { - "__id__": 346 + "__id__": 362 }, "_lpos": { "__type__": "cc.Vec3", @@ -2153,14 +2153,14 @@ "_active": true, "_components": [ { - "__id__": 283 + "__id__": 299 }, { - "__id__": 285 + "__id__": 301 } ], "_prefab": { - "__id__": 287 + "__id__": 303 }, "_lpos": { "__type__": "cc.Vec3", @@ -3102,7 +3102,7 @@ "__id__": 82 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 122 @@ -3329,10 +3329,7 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@42f26", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -3468,10 +3465,7 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@181ce", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -3607,10 +3601,7 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@9a244", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -3746,10 +3737,7 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@9a244", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -3885,10 +3873,7 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@ba483", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -4024,10 +4009,7 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@7f2ee", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 1, "_fillType": 0, "_sizeMode": 0, @@ -4074,19 +4056,25 @@ "_children": [ { "__id__": 164 + }, + { + "__id__": 278 + }, + { + "__id__": 286 } ], "_active": true, "_components": [ { - "__id__": 278 + "__id__": 294 }, { - "__id__": 280 + "__id__": 296 } ], "_prefab": { - "__id__": 282 + "__id__": 298 }, "_lpos": { "__type__": "cc.Vec3", @@ -6771,6 +6759,402 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 163 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 279 + }, + { + "__id__": 281 + }, + { + "__id__": 283 + } + ], + "_prefab": { + "__id__": 285 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -41.70556640625, + "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__": 278 + }, + "_enabled": true, + "__prefab": { + "__id__": 280 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 6.16748046875, + "height": 27.2 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e5CWfZ1gVDjo8oR9V7Psts" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 278 + }, + "_enabled": true, + "__prefab": { + "__id__": 282 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "[", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 15, + "_fontSize": 15, + "_fontFamily": "Arial", + "_lineHeight": 20, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 1, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0aWBMfC99Cfo0aSkkI00lM" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 278 + }, + "_enabled": true, + "__prefab": { + "__id__": 284 + }, + "_alignFlags": 8, + "_target": null, + "_left": -5, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1ckrCv8/hIg56/EVJ3VSXl" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "721YvmtH9EL4I9OyzJhE2z", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 163 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 287 + }, + { + "__id__": 289 + }, + { + "__id__": 291 + } + ], + "_prefab": { + "__id__": 293 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 41.70556640625, + "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__": 286 + }, + "_enabled": true, + "__prefab": { + "__id__": 288 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 6.16748046875, + "height": 27.2 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "21Yim79rNLL60GSHBXdl38" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 286 + }, + "_enabled": true, + "__prefab": { + "__id__": 290 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "]", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 15, + "_fontSize": 15, + "_fontFamily": "Arial", + "_lineHeight": 20, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 1, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "51TBvlsKFGWqY2gONqWvtm" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 286 + }, + "_enabled": true, + "__prefab": { + "__id__": 292 + }, + "_alignFlags": 32, + "_target": null, + "_left": 29.789306640625, + "_right": -5, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 20, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e9Or2VUNdPJbahIXwLb54A" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "14cnv4dvtOxYIOG4QqkBSA", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -6781,7 +7165,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 295 }, "_contentSize": { "__type__": "cc.Size", @@ -6809,7 +7193,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 297 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6890,7 +7274,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 300 }, "_contentSize": { "__type__": "cc.Size", @@ -6918,7 +7302,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 302 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6973,17 +7357,17 @@ }, "_children": [ { - "__id__": 289 + "__id__": 305 } ], "_active": false, "_components": [ { - "__id__": 295 + "__id__": 311 } ], "_prefab": { - "__id__": 297 + "__id__": 313 }, "_lpos": { "__type__": "cc.Vec3", @@ -7020,20 +7404,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 288 + "__id__": 304 }, "_children": [], "_active": true, "_components": [ { - "__id__": 290 + "__id__": 306 }, { - "__id__": 292 + "__id__": 308 } ], "_prefab": { - "__id__": 294 + "__id__": 310 }, "_lpos": { "__type__": "cc.Vec3", @@ -7070,11 +7454,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 305 }, "_enabled": true, "__prefab": { - "__id__": 291 + "__id__": 307 }, "_contentSize": { "__type__": "cc.Size", @@ -7098,11 +7482,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 305 }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 309 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7179,11 +7563,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 288 + "__id__": 304 }, "_enabled": true, "__prefab": { - "__id__": 296 + "__id__": 312 }, "_contentSize": { "__type__": "cc.Size", @@ -7224,17 +7608,17 @@ }, "_children": [ { - "__id__": 299 + "__id__": 315 } ], "_active": false, "_components": [ { - "__id__": 305 + "__id__": 321 } ], "_prefab": { - "__id__": 307 + "__id__": 323 }, "_lpos": { "__type__": "cc.Vec3", @@ -7271,20 +7655,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 298 + "__id__": 314 }, "_children": [], "_active": true, "_components": [ { - "__id__": 300 + "__id__": 316 }, { - "__id__": 302 + "__id__": 318 } ], "_prefab": { - "__id__": 304 + "__id__": 320 }, "_lpos": { "__type__": "cc.Vec3", @@ -7321,11 +7705,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 315 }, "_enabled": true, "__prefab": { - "__id__": 301 + "__id__": 317 }, "_contentSize": { "__type__": "cc.Size", @@ -7349,11 +7733,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 315 }, "_enabled": true, "__prefab": { - "__id__": 303 + "__id__": 319 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7430,11 +7814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 298 + "__id__": 314 }, "_enabled": true, "__prefab": { - "__id__": 306 + "__id__": 322 }, "_contentSize": { "__type__": "cc.Size", @@ -7475,20 +7859,20 @@ }, "_children": [ { - "__id__": 309 + "__id__": 325 }, { - "__id__": 315 + "__id__": 331 } ], "_active": false, "_components": [ { - "__id__": 321 + "__id__": 337 } ], "_prefab": { - "__id__": 323 + "__id__": 339 }, "_lpos": { "__type__": "cc.Vec3", @@ -7525,20 +7909,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 308 + "__id__": 324 }, "_children": [], "_active": true, "_components": [ { - "__id__": 310 + "__id__": 326 }, { - "__id__": 312 + "__id__": 328 } ], "_prefab": { - "__id__": 314 + "__id__": 330 }, "_lpos": { "__type__": "cc.Vec3", @@ -7575,11 +7959,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 309 + "__id__": 325 }, "_enabled": true, "__prefab": { - "__id__": 311 + "__id__": 327 }, "_contentSize": { "__type__": "cc.Size", @@ -7603,11 +7987,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 309 + "__id__": 325 }, "_enabled": true, "__prefab": { - "__id__": 313 + "__id__": 329 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7664,20 +8048,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 308 + "__id__": 324 }, "_children": [], "_active": true, "_components": [ { - "__id__": 316 + "__id__": 332 }, { - "__id__": 318 + "__id__": 334 } ], "_prefab": { - "__id__": 320 + "__id__": 336 }, "_lpos": { "__type__": "cc.Vec3", @@ -7714,11 +8098,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 331 }, "_enabled": true, "__prefab": { - "__id__": 317 + "__id__": 333 }, "_contentSize": { "__type__": "cc.Size", @@ -7742,11 +8126,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 331 }, "_enabled": true, "__prefab": { - "__id__": 319 + "__id__": 335 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7823,11 +8207,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 308 + "__id__": 324 }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 338 }, "_contentSize": { "__type__": "cc.Size", @@ -7868,20 +8252,20 @@ }, "_children": [ { - "__id__": 325 + "__id__": 341 }, { - "__id__": 331 + "__id__": 347 } ], "_active": false, "_components": [ { - "__id__": 337 + "__id__": 353 } ], "_prefab": { - "__id__": 339 + "__id__": 355 }, "_lpos": { "__type__": "cc.Vec3", @@ -7918,20 +8302,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 324 + "__id__": 340 }, "_children": [], "_active": true, "_components": [ { - "__id__": 326 + "__id__": 342 }, { - "__id__": 328 + "__id__": 344 } ], "_prefab": { - "__id__": 330 + "__id__": 346 }, "_lpos": { "__type__": "cc.Vec3", @@ -7968,11 +8352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 341 }, "_enabled": true, "__prefab": { - "__id__": 327 + "__id__": 343 }, "_contentSize": { "__type__": "cc.Size", @@ -7996,11 +8380,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 325 + "__id__": 341 }, "_enabled": true, "__prefab": { - "__id__": 329 + "__id__": 345 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8057,20 +8441,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 324 + "__id__": 340 }, "_children": [], "_active": true, "_components": [ { - "__id__": 332 + "__id__": 348 }, { - "__id__": 334 + "__id__": 350 } ], "_prefab": { - "__id__": 336 + "__id__": 352 }, "_lpos": { "__type__": "cc.Vec3", @@ -8107,11 +8491,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 347 }, "_enabled": true, "__prefab": { - "__id__": 333 + "__id__": 349 }, "_contentSize": { "__type__": "cc.Size", @@ -8135,11 +8519,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 331 + "__id__": 347 }, "_enabled": true, "__prefab": { - "__id__": 335 + "__id__": 351 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8216,11 +8600,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 354 }, "_contentSize": { "__type__": "cc.Size", @@ -8261,7 +8645,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 341 + "__id__": 357 }, "_contentSize": { "__type__": "cc.Size", @@ -8289,7 +8673,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 343 + "__id__": 359 }, "atking_bg": { "__id__": 127 @@ -8325,7 +8709,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 345 + "__id__": 361 }, "playOnLoad": true, "_clips": [ diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index ae47c5b3..f3ee6bd9 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -1,4 +1,4 @@ -// ========== 从 HeroAttrs.ts 导入属性相关定义 ========== +// ========== 从 HeroAttrs.ts 导入属性相关定义 ========== import { Attrs } from "./HeroAttrs"; export enum HSSet { @@ -134,7 +134,6 @@ export interface SkillConfig { gold?: number, // 获取金币技能的金币值 hit_count: number, // 可命中次数 hitcd: number, // 持续伤害的伤害间隔(秒) - /** @deprecated 已下沉到 SkillView @property（prefab 配置），此处仅作兜底 */ speed: number, // 移动速度 with: number, // 宽度(暂时无用) ready: number, // 前摇时间 @@ -143,14 +142,11 @@ export interface SkillConfig { EAnm: number, // 结束动画ID DAnm: string, // 命中后动画ID IType: IType, // 技能类型(近战/远程/辅助) - /** @deprecated 已下沉到 SkillView @property（prefab 配置），此处仅作兜底 */ RType: RType, // 技能运行类型(直线/贝塞尔/固定起点/固定终点) - /** @deprecated 已下沉到 SkillView @property（prefab 配置），此处仅作兜底 */ EType: EType, // 结束条件(动画结束/时间结束/距离结束/碰撞/次数结束) bezier_start_y?: number, // 贝塞尔起始抬升高度 bezier_mid_y?: number, // 贝塞尔中间高度增量 bezier_arc?: number, // 贝塞尔弧度系数 - /** @deprecated 已下沉到 SkillView @property（prefab 配置），此处仅作兜底 */ time?: number, // timeEnd 持续时间(秒) kind?: SkillKind, // 主效果类型 crt?: number, // 额外暴击率 @@ -222,22 +218,22 @@ export const SkillSet: Record = { DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, is_accel: true, RType: RType.bezier, EType: EType.collision, info: "造成攻击力100%的伤害", }, - 6002: { + 6002: { uuid: 6002, name: "飞刀", sp_name: "a2", icon: "Sword-FA_WP_Main_Sword_009_GraySilver", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, is_accel: true, RType: RType.bezier, EType: EType.collision, info: "造成攻击力100%的伤害", }, - 6003: { + 6003: { uuid: 6003, name: "匕首", sp_name: "a3", icon: "Sword-FA_WP_Main_Sword_019_WoodSilver", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, is_accel: true, RType: RType.bezier, EType: EType.collision, info: "造成攻击力100%的伤害", }, - 6004: { + 6004: { uuid: 6004, name: "飞斧", sp_name: "a4", icon: "Axe-FA_WP_Main_Axe_004_WoodGray", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, is_accel: true, RType: RType.bezier, EType: EType.collision, info: "造成攻击力100%的伤害", }, - 6005: { + 6005: { uuid: 6005, name: "飞枪", sp_name: "a5", icon: "Spear-FA_WP_Main_Spear_010_MetalBlue", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, is_accel: true, RType: RType.bezier, EType: EType.collision, info: "造成攻击力100%的伤害", @@ -245,7 +241,7 @@ export const SkillSet: Record = { 6006: { uuid: 6006, name: "攻击", sp_name: "atk", icon: "Stat_Attack_01", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", DTType: DTType.single, ap: 100, hit_count: 1, hitcd: 0.2, speed: 720, with: 0, ready: 0.2, EAnm: 0, DAnm: "", IType: IType.Melee, is_accel: true, - RType: RType.fixed, EType: EType.collision, info: "造成攻击力100%的伤害", + RType: RType.bezier, EType: EType.collision, info: "造成攻击力100%的伤害", }, 6007: { uuid: 6007, name: "飞棒", sp_name: "b1", icon: "Blunt-FA_WP_Main_Blunt_002_Wood", TGroup: TGroup.Enemy, readyAnm: "", endAnm: "", act: "atk", diff --git a/assets/script/game/hero/Mon.ts b/assets/script/game/hero/Mon.ts index c2da950b..80eb684b 100644 --- a/assets/script/game/hero/Mon.ts +++ b/assets/script/game/hero/Mon.ts @@ -148,8 +148,9 @@ export class Monster extends ecs.Entity { (node as any)._baseScale = node.scale.clone(); } - // 统一挂到实体显示层 HERO 节点下 - node.parent = scene.entityLayer!.node!.getChildByName("HERO")!; + // 按身份挂载显示层：Boss → BOSS 层（最底），小怪 → MON 层（编辑器已配置好层级顺序） + const layerName = is_boss ? "BOSS" : "MON"; + node.parent = scene.entityLayer!.node!.getChildByName(layerName)!; var view = node.getComponent(HeroViewComp)!; const collider = node.getComponent(BoxCollider2D); // 入场期间关闭碰撞，防止下落时提前参与战斗 diff --git a/assets/script/game/hero/MoveComp.ts b/assets/script/game/hero/MoveComp.ts index 3da80f12..a60d1918 100644 --- a/assets/script/game/hero/MoveComp.ts +++ b/assets/script/game/hero/MoveComp.ts @@ -145,7 +145,9 @@ export class MoveSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate const enemyX = enemy.node.position.x; const dist = Math.abs(selfX - enemyX); const attackRange = model.dis; - const inRange = dist <= attackRange; + /** 近战贴身作战：攻击距离 dis(100) 大于技能范围(60)，推进到与敌人相隔 60 才停下，保证技能可命中且不过度贴身 */ + const stopRange = model.type === 0 ? 60 : attackRange; + const inRange = dist <= stopRange; if (inRange) { /** 进入攻击范围：停止移动，进入攻击状态，由 SCastSystem 负责技能释放 */ @@ -216,13 +218,19 @@ export class MoveSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate private updateRenderOrder() { const scene = smc.map?.MapView?.scene; - const actorRoot = scene?.entityLayer?.node?.getChildByName("HERO"); - if (!actorRoot) return; + const layerNode = scene?.entityLayer?.node; + if (!layerNode) return; const now = Date.now() / 1000; if (now - this.lastRenderSortAt < this.renderSortInterval) return; this.lastRenderSortAt = now; + const heroRoot = layerNode.getChildByName("HERO"); + const monRoot = layerNode.getChildByName("MON"); + const bossRoot = layerNode.getChildByName("BOSS"); + + /** 分层重排同层节点：各阵营层内按 Y 轴路次 -> 前后位置 -> 出生序 -> eid 排序 + * （Boss 已有独立 BOSS 层固定在最底，无需 bossPriority 参与排序） */ this.renderEntryCount = 0; ecs.query(this.getHeroViewMatcher()).forEach(e => { const attrs = e.get(HeroAttrsComp); @@ -230,8 +238,16 @@ export class MoveSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate if (!attrs || !actorView?.node || attrs.is_dead) return; if (attrs.fac !== FacSet.HERO && attrs.fac !== FacSet.MON) return; - if (actorView.node.parent !== actorRoot) { - actorView.node.parent = actorRoot; + /** 按阵营/身份归位到对应显示层 */ + let targetRoot: Node | null | undefined; + if (attrs.fac === FacSet.HERO) { + targetRoot = heroRoot; + } else { + targetRoot = attrs.is_boss ? (bossRoot ?? monRoot ?? heroRoot) : (monRoot ?? heroRoot); + } + if (!targetRoot) return; + if (actorView.node.parent !== targetRoot) { + actorView.node.parent = targetRoot; } /** 统一从 MoveComp 获取 spawnOrder */ @@ -250,7 +266,6 @@ export class MoveSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate this.renderEntries.push(entry); } entry.node = actorView.node; - entry.bossPriority = attrs.is_boss ? 1 : 0; entry.laneScore = laneScore; entry.frontScore = frontScore; entry.spawnOrder = spawnOrder; @@ -259,9 +274,7 @@ export class MoveSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate }); this.renderEntries.length = this.renderEntryCount; - /** 定时重排同层节点：Boss 优先级 -> Y 轴路次 -> 前后位置 -> 出生序 -> eid */ this.renderEntries.sort((a, b) => { - if (a.bossPriority !== b.bossPriority) return a.bossPriority - b.bossPriority; // Y轴靠下的（laneScore 较大）应该在后面，从而渲染在上面 if (Math.abs(a.laneScore - b.laneScore) > 10) return a.laneScore - b.laneScore; if (a.frontScore !== b.frontScore) return a.frontScore - b.frontScore; @@ -269,8 +282,14 @@ export class MoveSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate return a.eid - b.eid; }); - this.renderEntries.forEach((item, index) => { + /** 分层应用 siblingIndex：各层内部从 0 递增 */ + const layerCounters = new Map(); + this.renderEntries.forEach((item) => { + const parent = item.node.parent; + if (!parent) return; + const index = layerCounters.get(parent) ?? 0; item.node.setSiblingIndex(index); + layerCounters.set(parent, index + 1); }); } } diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts index bb8d87d8..ae7edad2 100644 --- a/assets/script/game/map/MissionComp.ts +++ b/assets/script/game/map/MissionComp.ts @@ -1005,21 +1005,17 @@ export class MissionComp extends CCComp { this.clearBattleSceneNodes(); } - /** 清理战斗场景中的 HERO 和 SKILL 根节点下的所有子节点 */ + /** 清理战斗场景中的 HERO/MON/BOSS 和 SKILL 根节点下的所有子节点 */ private clearBattleSceneNodes() { const scene = smc.map?.MapView?.scene; const layer = scene?.entityLayer?.node; if (!layer) return; - const heroRoot = layer.getChildByName("HERO"); - const skillRoot = layer.getChildByName("SKILL"); - if (heroRoot) { - for (let i = heroRoot.children.length - 1; i >= 0; i--) { - heroRoot.children[i].destroy(); - } - } - if (skillRoot) { - for (let i = skillRoot.children.length - 1; i >= 0; i--) { - skillRoot.children[i].destroy(); + for (const name of ["HERO", "MON", "BOSS", "SKILL"]) { + const root = layer.getChildByName(name); + if (root) { + for (let i = root.children.length - 1; i >= 0; i--) { + root.children[i].destroy(); + } } } } diff --git a/assets/script/game/map/MissionMonComp.ts b/assets/script/game/map/MissionMonComp.ts index 22ccd4a1..2ac2271f 100644 --- a/assets/script/game/map/MissionMonComp.ts +++ b/assets/script/game/map/MissionMonComp.ts @@ -142,7 +142,7 @@ export class MissionMonCompComp extends CCComp { const spawnX = MissionMonCompComp.SPAWN_X_MIN + (MissionMonCompComp.SPAWN_X_MAX - MissionMonCompComp.SPAWN_X_MIN) * (posIndex / Math.max(1, BOSS_COUNT + MINION_COUNT - 1)); - const landingY = basePos.y + (monData.isBoss ? 6 : 0); + const landingY = basePos.y; const spawnPos: Vec3 = v3(spawnX, landingY + MissionMonCompComp.MON_DROP_HEIGHT, 0); this.globalSpawnOrder = (this.globalSpawnOrder + 1) % 999;