From 56832c41fe9fcf31555abcad6d0d325abb71780a Mon Sep 17 00:00:00 2001 From: panw Date: Fri, 10 Jan 2025 16:50:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E8=83=BD=E5=8A=A8=E7=94=BB=20?= =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resources/game/skills/anm/zhanz.anim | 2 +- assets/resources/game/skills/arrow.prefab | 26 +- .../resources/game/skills/arrow_bule.prefab | 61 ++- .../resources/game/skills/arrow_yellow.prefab | 61 ++- assets/resources/game/skills/b_arrow.prefab | 426 ------------------ .../resources/game/skills/b_arrow.prefab.meta | 13 - assets/resources/game/skills/ball_blue.prefab | 25 +- .../resources/game/skills/ball_green.prefab | 25 +- assets/resources/game/skills/ball_red.prefab | 25 +- .../resources/game/skills/ball_yellow.prefab | 25 +- .../resources/game/skills/buff/to_buff.anim | 62 +-- assets/resources/game/skills/buffto.prefab | 23 +- assets/resources/game/skills/bwind.prefab | 23 +- assets/resources/game/skills/fire.prefab | 23 +- assets/resources/game/skills/fireball.prefab | 23 +- assets/resources/game/skills/firequan.prefab | 23 +- assets/resources/game/skills/fires.prefab | 23 +- assets/resources/game/skills/fireto.prefab | 23 +- assets/resources/game/skills/flash.prefab | 4 +- assets/resources/game/skills/fwind.prefab | 23 +- assets/resources/game/skills/heath.prefab | 27 +- assets/resources/game/skills/heath/heath.anim | 16 +- .../resources/game/skills/heath/heath2.anim | 20 +- assets/resources/game/skills/heath2.prefab | 63 ++- assets/resources/game/skills/ice.prefab | 23 +- assets/resources/game/skills/icet.prefab | 23 +- assets/resources/game/skills/icez.prefab | 23 +- assets/resources/game/skills/okill.prefab | 40 +- assets/resources/game/skills/patk.prefab | 4 +- assets/resources/game/skills/shield.prefab | 25 +- assets/resources/game/skills/shoot1.prefab | 8 +- assets/resources/game/skills/shoot2.prefab | 4 +- assets/resources/game/skills/watert.prefab | 23 +- assets/resources/game/skills/zhanz.prefab | 8 +- assets/script/game/common/config/SkillSet.ts | 72 +-- assets/script/game/hero/HeroViewComp.ts | 7 + assets/script/game/skills/AnmEndCom.ts | 14 + .../{OnceCom.ts.meta => AnmEndCom.ts.meta} | 2 +- .../game/skills/{OnceCom.ts => EndAnmCom.ts} | 8 +- .../{NoRunCom.ts.meta => EndAnmCom.ts.meta} | 2 +- assets/script/game/skills/EndBoxCom.ts | 20 + assets/script/game/skills/EndBoxCom.ts.meta | 9 + assets/script/game/skills/EndLineCom.ts | 22 + assets/script/game/skills/EndLineCom.ts.meta | 9 + assets/script/game/skills/EndTimeCom.ts | 23 + assets/script/game/skills/EndTimeCom.ts.meta | 9 + assets/script/game/skills/LineCom.ts | 3 - assets/script/game/skills/LineMCom.ts | 9 +- assets/script/game/skills/NoRunCom.ts | 20 - assets/script/game/skills/Skill.ts | 1 - assets/script/game/skills/SkillCom.ts | 3 - assets/script/game/skills/timedCom.ts | 2 +- 52 files changed, 786 insertions(+), 695 deletions(-) delete mode 100644 assets/resources/game/skills/b_arrow.prefab delete mode 100644 assets/resources/game/skills/b_arrow.prefab.meta create mode 100644 assets/script/game/skills/AnmEndCom.ts rename assets/script/game/skills/{OnceCom.ts.meta => AnmEndCom.ts.meta} (70%) rename assets/script/game/skills/{OnceCom.ts => EndAnmCom.ts} (74%) rename assets/script/game/skills/{NoRunCom.ts.meta => EndAnmCom.ts.meta} (70%) create mode 100644 assets/script/game/skills/EndBoxCom.ts create mode 100644 assets/script/game/skills/EndBoxCom.ts.meta create mode 100644 assets/script/game/skills/EndLineCom.ts create mode 100644 assets/script/game/skills/EndLineCom.ts.meta create mode 100644 assets/script/game/skills/EndTimeCom.ts create mode 100644 assets/script/game/skills/EndTimeCom.ts.meta delete mode 100644 assets/script/game/skills/NoRunCom.ts diff --git a/assets/resources/game/skills/anm/zhanz.anim b/assets/resources/game/skills/anm/zhanz.anim index 3c83da7b..0c1d1383 100644 --- a/assets/resources/game/skills/anm/zhanz.anim +++ b/assets/resources/game/skills/anm/zhanz.anim @@ -9,7 +9,7 @@ "_native": "", "sample": 48, "speed": 1, - "wrapMode": 2, + "wrapMode": 1, "enableTrsBlending": false, "_duration": 0.3958333333333333, "_hash": 500763545, diff --git a/assets/resources/game/skills/arrow.prefab b/assets/resources/game/skills/arrow.prefab index c6ad9755..907deb4a 100644 --- a/assets/resources/game/skills/arrow.prefab +++ b/assets/resources/game/skills/arrow.prefab @@ -38,10 +38,13 @@ }, { "__id__": 16 + }, + { + "__id__": 18 } ], "_prefab": { - "__id__": 18 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -340,6 +343,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "fdtqvT47ZHtpqmElRhXm6a" }, + { + "__type__": "2332a3ShwFGNr2JGE9vSJPe", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "70TqaunGpEF6kOj4KFgq1N" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -349,6 +370,7 @@ "__id__": 0 }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": null + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/resources/game/skills/arrow_bule.prefab b/assets/resources/game/skills/arrow_bule.prefab index cc2153f9..43249c81 100644 --- a/assets/resources/game/skills/arrow_bule.prefab +++ b/assets/resources/game/skills/arrow_bule.prefab @@ -41,10 +41,13 @@ }, { "__id__": 18 + }, + { + "__id__": 20 } ], "_prefab": { - "__id__": 20 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -325,24 +328,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "bcCcCZuuJMgIWRgtrud9x7" }, - { - "__type__": "20503VOc7ZA84sbp8G72pxZ", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "18XBHN4s1Ov7Mg9VnmEPCS" - }, { "__type__": "cc.Animation", "_name": "", @@ -353,7 +338,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 17 }, "playOnLoad": true, "_clips": [ @@ -372,6 +357,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "02vCVFFYtJl6v3JAJsnnzv" }, + { + "__type__": "c92adevMwxBYYbFjVc25eV9", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8bDGLy7YdIkLGg/Uk6pd/M" + }, + { + "__type__": "20503VOc7ZA84sbp8G72pxZ", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d8nNPK0wVBxqa6DMQOcjxE" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/arrow_yellow.prefab b/assets/resources/game/skills/arrow_yellow.prefab index fb2d781b..e33718de 100644 --- a/assets/resources/game/skills/arrow_yellow.prefab +++ b/assets/resources/game/skills/arrow_yellow.prefab @@ -41,10 +41,13 @@ }, { "__id__": 18 + }, + { + "__id__": 20 } ], "_prefab": { - "__id__": 20 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -325,24 +328,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "bcCcCZuuJMgIWRgtrud9x7" }, - { - "__type__": "20503VOc7ZA84sbp8G72pxZ", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "18XBHN4s1Ov7Mg9VnmEPCS" - }, { "__type__": "cc.Animation", "_name": "", @@ -353,7 +338,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 17 }, "playOnLoad": true, "_clips": [ @@ -372,6 +357,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "02vCVFFYtJl6v3JAJsnnzv" }, + { + "__type__": "c92adevMwxBYYbFjVc25eV9", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d8IJiZ8qBEYoLJBJzL2Wu2" + }, + { + "__type__": "20503VOc7ZA84sbp8G72pxZ", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "945q50VupJu781Zu2mK07/" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/b_arrow.prefab b/assets/resources/game/skills/b_arrow.prefab deleted file mode 100644 index 5bf234fb..00000000 --- a/assets/resources/game/skills/b_arrow.prefab +++ /dev/null @@ -1,426 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "b_arrow", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "b_arrow", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - } - ], - "_active": true, - "_components": [ - { - "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 - }, - { - "__id__": 18 - } - ], - "_prefab": { - "__id__": 20 - }, - "_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": "skill", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [ - { - "__id__": 3 - } - ], - "_active": true, - "_components": [ - { - "__id__": 9 - } - ], - "_prefab": { - "__id__": 11 - }, - "_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": "Arrow", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 4 - }, - { - "__id__": 6 - } - ], - "_prefab": { - "__id__": 8 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 5 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 40, - "height": 20 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0bXCTL/l1A5YZuQAHcNimF" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 7 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "3c4eece6-9dcd-4e67-8c40-69c4879720bd@a5859", - "__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": "b9QUlReiVJ7ZDxbXwpC4IM" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "9fUsJF0/xIH6lvrQ3ar5z7", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 10 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b9gy3JAZNKCrWBoQOxNeQ5" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "e0ctKOHTNOX488RjpXen7k", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.49664333316829656, - "y": 0.5156666649712457 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "63NP9yq3hEUKD/OZZZ5t7x" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "enabledContactListener": true, - "bullet": true, - "awakeOnLoad": true, - "_group": 4, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f1VxV09PdOkofzgGv1tsZE" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -2.1, - "y": 0.4 - }, - "_size": { - "__type__": "cc.Size", - "width": 11.4, - "height": 7.8 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23eik112JPZYGiI8mJalTK" - }, - { - "__type__": "45646oIyIdA24W+0c5rdELD", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 19 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8ahZv91itPcYJm8S0veHYl" - }, - { - "__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/skills/b_arrow.prefab.meta b/assets/resources/game/skills/b_arrow.prefab.meta deleted file mode 100644 index 99da2866..00000000 --- a/assets/resources/game/skills/b_arrow.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "50eea97f-1c76-4863-8d54-2eaff7885a00", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "b_arrow" - } -} diff --git a/assets/resources/game/skills/ball_blue.prefab b/assets/resources/game/skills/ball_blue.prefab index bf02f713..043a649b 100644 --- a/assets/resources/game/skills/ball_blue.prefab +++ b/assets/resources/game/skills/ball_blue.prefab @@ -41,10 +41,13 @@ }, { "__id__": 18 + }, + { + "__id__": 20 } ], "_prefab": { - "__id__": 20 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -176,7 +179,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "3c4eece6-9dcd-4e67-8c40-69c4879720bd@c86cc", + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@a5c8a", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -372,6 +375,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "30Z4lGtPtNRK+v4W55Fdpp" }, + { + "__type__": "2332a3ShwFGNr2JGE9vSJPe", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4eMHumwftHy4v/nD7o8Ys6" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/ball_green.prefab b/assets/resources/game/skills/ball_green.prefab index abb48203..139d1235 100644 --- a/assets/resources/game/skills/ball_green.prefab +++ b/assets/resources/game/skills/ball_green.prefab @@ -41,10 +41,13 @@ }, { "__id__": 18 + }, + { + "__id__": 20 } ], "_prefab": { - "__id__": 20 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -176,7 +179,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "3c4eece6-9dcd-4e67-8c40-69c4879720bd@a795c", + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@1013c", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -372,6 +375,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "9aKyMeHsJGhJcXRvCDys4m" }, + { + "__type__": "2332a3ShwFGNr2JGE9vSJPe", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "206m+aTHJO2byDoskuS+VO" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/ball_red.prefab b/assets/resources/game/skills/ball_red.prefab index 15a30053..358659f8 100644 --- a/assets/resources/game/skills/ball_red.prefab +++ b/assets/resources/game/skills/ball_red.prefab @@ -41,10 +41,13 @@ }, { "__id__": 18 + }, + { + "__id__": 20 } ], "_prefab": { - "__id__": 20 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -176,7 +179,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "3c4eece6-9dcd-4e67-8c40-69c4879720bd@e7223", + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@4fe96", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -372,6 +375,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "f0IdZYZi5FqJJILtmzcqSS" }, + { + "__type__": "2332a3ShwFGNr2JGE9vSJPe", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "07CxIRyllNGZ3jegdA6b0I" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/ball_yellow.prefab b/assets/resources/game/skills/ball_yellow.prefab index 14387fbc..2680f15b 100644 --- a/assets/resources/game/skills/ball_yellow.prefab +++ b/assets/resources/game/skills/ball_yellow.prefab @@ -41,10 +41,13 @@ }, { "__id__": 18 + }, + { + "__id__": 20 } ], "_prefab": { - "__id__": 20 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -176,7 +179,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "3c4eece6-9dcd-4e67-8c40-69c4879720bd@c30fb", + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@da4d2", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -372,6 +375,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "edWGjGlW1Nb5g+gtMl/YzU" }, + { + "__type__": "2332a3ShwFGNr2JGE9vSJPe", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "57+GZe/QpEe54512IPC45A" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/buff/to_buff.anim b/assets/resources/game/skills/buff/to_buff.anim index 3a3c2b25..4e5f2306 100644 --- a/assets/resources/game/skills/buff/to_buff.anim +++ b/assets/resources/game/skills/buff/to_buff.anim @@ -11,7 +11,7 @@ "speed": 1, "wrapMode": 2, "enableTrsBlending": false, - "_duration": 0.5, + "_duration": 0.16666666666666666, "_hash": 500763545, "_tracks": [ { @@ -77,7 +77,7 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.5 + 0.16666666666666666 ], "_values": [ { @@ -90,9 +90,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -104,9 +102,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null } ], "preExtrapolation": 1, @@ -122,7 +118,7 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.5 + 0.16666666666666666 ], "_values": [ { @@ -135,9 +131,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -149,9 +143,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null } ], "preExtrapolation": 1, @@ -167,7 +159,7 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.5 + 0.16666666666666666 ], "_values": [ { @@ -180,9 +172,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -194,9 +184,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null } ], "preExtrapolation": 1, @@ -263,7 +251,7 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.5 + 0.16666666666666666 ], "_values": [ { @@ -276,9 +264,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -290,9 +276,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null } ], "preExtrapolation": 1, @@ -308,7 +292,7 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.5 + 0.16666666666666666 ], "_values": [ { @@ -321,9 +305,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -335,9 +317,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null } ], "preExtrapolation": 1, @@ -353,7 +333,7 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.5 + 0.16666666666666666 ], "_values": [ { @@ -366,9 +346,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -380,9 +358,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null } ], "preExtrapolation": 1, diff --git a/assets/resources/game/skills/buffto.prefab b/assets/resources/game/skills/buffto.prefab index cd32b814..3a2ddd9c 100644 --- a/assets/resources/game/skills/buffto.prefab +++ b/assets/resources/game/skills/buffto.prefab @@ -34,10 +34,13 @@ }, { "__id__": 10 + }, + { + "__id__": 12 } ], "_prefab": { - "__id__": 12 + "__id__": 14 }, "_lpos": { "__type__": "cc.Vec3", @@ -200,6 +203,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "deBQkHYeFNy6ZH3Lm8VORa" }, + { + "__type__": "2332a3ShwFGNr2JGE9vSJPe", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b9U8c503JGWotNNLA4G31O" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/bwind.prefab b/assets/resources/game/skills/bwind.prefab index 02e958e9..18bdad9f 100644 --- a/assets/resources/game/skills/bwind.prefab +++ b/assets/resources/game/skills/bwind.prefab @@ -44,10 +44,13 @@ }, { "__id__": 24 + }, + { + "__id__": 26 } ], "_prefab": { - "__id__": 26 + "__id__": 28 }, "_lpos": { "__type__": "cc.Vec3", @@ -511,6 +514,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "38+qbhXMVHtoU9k7o0hvx8" }, + { + "__type__": "6a7fejJxHlM5r/TS8IFF1Kq", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 27 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "36K2fPnkJLPbBwJ5DxQ0ry" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/fire.prefab b/assets/resources/game/skills/fire.prefab index 187d07a2..72e45b08 100644 --- a/assets/resources/game/skills/fire.prefab +++ b/assets/resources/game/skills/fire.prefab @@ -41,10 +41,13 @@ }, { "__id__": 18 + }, + { + "__id__": 20 } ], "_prefab": { - "__id__": 20 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -372,6 +375,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "7fXWI3HkBNb5PGUGVxo0Fu" }, + { + "__type__": "c92adevMwxBYYbFjVc25eV9", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "71Yn66OoNGsbkGVmrvArkR" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/fireball.prefab b/assets/resources/game/skills/fireball.prefab index 2a6f3af6..0287fd83 100644 --- a/assets/resources/game/skills/fireball.prefab +++ b/assets/resources/game/skills/fireball.prefab @@ -41,10 +41,13 @@ }, { "__id__": 18 + }, + { + "__id__": 20 } ], "_prefab": { - "__id__": 20 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -369,6 +372,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "89Hw/hPKtGk4bNAER58D3H" }, + { + "__type__": "2332a3ShwFGNr2JGE9vSJPe", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1asNSHndJCf4C7bRjXxTHi" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/firequan.prefab b/assets/resources/game/skills/firequan.prefab index 99f08baa..16c5c73e 100644 --- a/assets/resources/game/skills/firequan.prefab +++ b/assets/resources/game/skills/firequan.prefab @@ -41,10 +41,13 @@ }, { "__id__": 18 + }, + { + "__id__": 20 } ], "_prefab": { - "__id__": 20 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -369,6 +372,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "1cxZvyZhlANaY6MJ8ihK/l" }, + { + "__type__": "6a7fejJxHlM5r/TS8IFF1Kq", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4c47c40/5NYqQ9BorJuPcK" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/fires.prefab b/assets/resources/game/skills/fires.prefab index 5cfad362..471f8426 100644 --- a/assets/resources/game/skills/fires.prefab +++ b/assets/resources/game/skills/fires.prefab @@ -44,10 +44,13 @@ }, { "__id__": 24 + }, + { + "__id__": 26 } ], "_prefab": { - "__id__": 26 + "__id__": 28 }, "_lpos": { "__type__": "cc.Vec3", @@ -511,6 +514,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "f70rkggRZACZKqkR8MhiBL" }, + { + "__type__": "6a7fejJxHlM5r/TS8IFF1Kq", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 27 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b0xxzph7dOs7/fPyaSemba" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/fireto.prefab b/assets/resources/game/skills/fireto.prefab index 2795cc9b..53fb2655 100644 --- a/assets/resources/game/skills/fireto.prefab +++ b/assets/resources/game/skills/fireto.prefab @@ -41,10 +41,13 @@ }, { "__id__": 18 + }, + { + "__id__": 20 } ], "_prefab": { - "__id__": 20 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -369,6 +372,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "f70rkggRZACZKqkR8MhiBL" }, + { + "__type__": "6a7fejJxHlM5r/TS8IFF1Kq", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "dfKETtXCZHLrUfWvYgQ2h5" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/flash.prefab b/assets/resources/game/skills/flash.prefab index 46c31e0c..2df7ab9c 100644 --- a/assets/resources/game/skills/flash.prefab +++ b/assets/resources/game/skills/flash.prefab @@ -624,7 +624,7 @@ "fileId": "16LYpWaddLdZBFsLWFfMKv" }, { - "__type__": "3a728/XIrpLz7uIWIOQNGox", + "__type__": "9e0d3yayihFMKm6st+kCG3D", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -639,7 +639,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cdldmD9gJNR7CFrZE7t31h" + "fileId": "63XObdQV9MNLiUuCUV/dIw" }, { "__type__": "cc.PrefabInfo", diff --git a/assets/resources/game/skills/fwind.prefab b/assets/resources/game/skills/fwind.prefab index 967ceaba..ef025f5b 100644 --- a/assets/resources/game/skills/fwind.prefab +++ b/assets/resources/game/skills/fwind.prefab @@ -41,10 +41,13 @@ }, { "__id__": 18 + }, + { + "__id__": 20 } ], "_prefab": { - "__id__": 20 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -369,6 +372,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "66QaoN6oxLQJtSZrGCqmIz" }, + { + "__type__": "6a7fejJxHlM5r/TS8IFF1Kq", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "35q2dGmmZF2J4J5u44z1jv" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/heath.prefab b/assets/resources/game/skills/heath.prefab index 988252d3..62ab2066 100644 --- a/assets/resources/game/skills/heath.prefab +++ b/assets/resources/game/skills/heath.prefab @@ -44,10 +44,13 @@ }, { "__id__": 29 + }, + { + "__id__": 31 } ], "_prefab": { - "__id__": 31 + "__id__": 33 }, "_lpos": { "__type__": "cc.Vec3", @@ -160,8 +163,8 @@ ], "value": { "__type__": "cc.Vec3", - "x": 24, - "y": 205, + "x": 0, + "y": 200, "z": 0 } }, @@ -527,6 +530,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "aeKuNdU4RH0aHU657oxakt" }, + { + "__type__": "6a7fejJxHlM5r/TS8IFF1Kq", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 32 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3fysFPaqZDX5SZP/okxb81" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/heath/heath.anim b/assets/resources/game/skills/heath/heath.anim index 17de61f3..5ff7dfd9 100644 --- a/assets/resources/game/skills/heath/heath.anim +++ b/assets/resources/game/skills/heath/heath.anim @@ -74,8 +74,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3333333333333333, - 0.6666666666666666 + 0.3333333432674408, + 0.6666666865348816 ], "_values": [ { @@ -94,7 +94,7 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": 0.6, + "value": 0.6000000238418579, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, @@ -128,8 +128,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3333333333333333, - 0.6666666666666666 + 0.3333333432674408, + 0.6666666865348816 ], "_values": [ { @@ -148,7 +148,7 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": 0.6, + "value": 0.6000000238418579, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, @@ -182,8 +182,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3333333333333333, - 0.6666666666666666 + 0.3333333432674408, + 0.6666666865348816 ], "_values": [ { diff --git a/assets/resources/game/skills/heath/heath2.anim b/assets/resources/game/skills/heath/heath2.anim index 17de61f3..810b9b81 100644 --- a/assets/resources/game/skills/heath/heath2.anim +++ b/assets/resources/game/skills/heath/heath2.anim @@ -1,7 +1,7 @@ [ { "__type__": "cc.AnimationClip", - "_name": "heath", + "_name": "heath2", "_objFlags": 0, "__editorExtras__": { "embeddedPlayerGroups": [] @@ -9,7 +9,7 @@ "_native": "", "sample": 12, "speed": 1, - "wrapMode": 2, + "wrapMode": 1, "enableTrsBlending": false, "_duration": 0.6666666666666666, "_hash": 500763545, @@ -74,8 +74,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3333333333333333, - 0.6666666666666666 + 0.3333333432674408, + 0.6666666865348816 ], "_values": [ { @@ -94,7 +94,7 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": 0.6, + "value": 0.6000000238418579, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, @@ -128,8 +128,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3333333333333333, - 0.6666666666666666 + 0.3333333432674408, + 0.6666666865348816 ], "_values": [ { @@ -148,7 +148,7 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": 0.6, + "value": 0.6000000238418579, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, @@ -182,8 +182,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3333333333333333, - 0.6666666666666666 + 0.3333333432674408, + 0.6666666865348816 ], "_values": [ { diff --git a/assets/resources/game/skills/heath2.prefab b/assets/resources/game/skills/heath2.prefab index 9f9e69b6..1de253c8 100644 --- a/assets/resources/game/skills/heath2.prefab +++ b/assets/resources/game/skills/heath2.prefab @@ -22,32 +22,32 @@ "__id__": 2 }, { - "__id__": 13 + "__id__": 14 } ], "_active": true, "_components": [ { - "__id__": 19 + "__id__": 20 }, { - "__id__": 21 + "__id__": 22 }, { - "__id__": 23 + "__id__": 24 }, { - "__id__": 25 + "__id__": 26 }, { - "__id__": 27 + "__id__": 28 }, { - "__id__": 29 + "__id__": 30 } ], "_prefab": { - "__id__": 31 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -130,6 +130,9 @@ }, { "__id__": 11 + }, + { + "__id__": 13 } ], "removedComponents": [] @@ -160,8 +163,8 @@ ], "value": { "__type__": "cc.Vec3", - "x": 24, - "y": 300, + "x": 0, + "y": 120, "z": 0 } }, @@ -230,6 +233,16 @@ "85FjuP7AFBvr2ZutPHmCqx" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 6 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, { "__type__": "cc.Node", "_name": "Node", @@ -242,14 +255,14 @@ "_active": true, "_components": [ { - "__id__": 14 + "__id__": 15 }, { - "__id__": 16 + "__id__": 17 } ], "_prefab": { - "__id__": 18 + "__id__": 19 }, "_lpos": { "__type__": "cc.Vec3", @@ -286,11 +299,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 16 }, "_contentSize": { "__type__": "cc.Size", @@ -314,11 +327,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 13 + "__id__": 14 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 18 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -376,7 +389,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 21 }, "_contentSize": { "__type__": "cc.Size", @@ -404,7 +417,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 23 }, "enabledContactListener": true, "bullet": true, @@ -438,7 +451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 25 }, "tag": 8, "_group": 4, @@ -472,7 +485,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 27 }, "_id": "" }, @@ -490,7 +503,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 29 }, "playOnLoad": true, "_clips": [ @@ -510,7 +523,7 @@ "fileId": "684O4uajxIsKmwoOacfpUS" }, { - "__type__": "38c69ebGPNGs5g0wcmjNHqR", + "__type__": "9e0d3yayihFMKm6st+kCG3D", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -519,13 +532,13 @@ }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 31 }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "aeKuNdU4RH0aHU657oxakt" + "fileId": "40ZOnM4A1JXoRtABQW5hQD" }, { "__type__": "cc.PrefabInfo", diff --git a/assets/resources/game/skills/ice.prefab b/assets/resources/game/skills/ice.prefab index fec12b0c..ea14df63 100644 --- a/assets/resources/game/skills/ice.prefab +++ b/assets/resources/game/skills/ice.prefab @@ -41,10 +41,13 @@ }, { "__id__": 18 + }, + { + "__id__": 20 } ], "_prefab": { - "__id__": 20 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -372,6 +375,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "71rQac811CkZmLJZ+3hWYp" }, + { + "__type__": "c92adevMwxBYYbFjVc25eV9", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "beqrCy1W1KT5dRKWJ1+thK" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/icet.prefab b/assets/resources/game/skills/icet.prefab index 2b073c39..6de94cc6 100644 --- a/assets/resources/game/skills/icet.prefab +++ b/assets/resources/game/skills/icet.prefab @@ -41,10 +41,13 @@ }, { "__id__": 18 + }, + { + "__id__": 20 } ], "_prefab": { - "__id__": 20 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -369,6 +372,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "30IyV8mGNDe4xgtVIZXhYJ" }, + { + "__type__": "6a7fejJxHlM5r/TS8IFF1Kq", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cfIy5zwNtPC5+WhZdAgifR" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/icez.prefab b/assets/resources/game/skills/icez.prefab index 1475ef49..35efa2bf 100644 --- a/assets/resources/game/skills/icez.prefab +++ b/assets/resources/game/skills/icez.prefab @@ -47,10 +47,13 @@ }, { "__id__": 30 + }, + { + "__id__": 32 } ], "_prefab": { - "__id__": 32 + "__id__": 34 }, "_lpos": { "__type__": "cc.Vec3", @@ -641,6 +644,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "f0WuCVyghGuoMRV2ZX5pXb" }, + { + "__type__": "6a7fejJxHlM5r/TS8IFF1Kq", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 33 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "82vxhqW+1KPZ0VgAZEHPix" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/okill.prefab b/assets/resources/game/skills/okill.prefab index 41754537..5bf4e8c5 100644 --- a/assets/resources/game/skills/okill.prefab +++ b/assets/resources/game/skills/okill.prefab @@ -493,24 +493,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "0f1YvlzyZOLIAHiCyCBXRz" }, - { - "__type__": "34a04mZHI1DgLIYWdikGBim", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 25 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "6cKfw7nVpIeaUlhgvnM6bz" - }, { "__type__": "f5c0acU9TtA5JBGObMPOZe3", "_name": "", @@ -521,7 +503,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 25 }, "_id": "" }, @@ -539,7 +521,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 27 }, "_id": "" }, @@ -547,6 +529,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "23sOGER+dM7oamzeBjdtxW" }, + { + "__type__": "9e0d3yayihFMKm6st+kCG3D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 29 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "78bj2ByUND2aUFLmAK0Syx" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/patk.prefab b/assets/resources/game/skills/patk.prefab index 9e7b3b5f..7217c2fb 100644 --- a/assets/resources/game/skills/patk.prefab +++ b/assets/resources/game/skills/patk.prefab @@ -183,7 +183,7 @@ "fileId": "8ahZv91itPcYJm8S0veHYl" }, { - "__type__": "3a728/XIrpLz7uIWIOQNGox", + "__type__": "2332a3ShwFGNr2JGE9vSJPe", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -198,7 +198,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "1d/L5AuORDL4DvwwET96Ph" + "fileId": "b8ejThh2BH64Bkp9J1OUJs" }, { "__type__": "cc.PrefabInfo", diff --git a/assets/resources/game/skills/shield.prefab b/assets/resources/game/skills/shield.prefab index b3987f40..09212a16 100644 --- a/assets/resources/game/skills/shield.prefab +++ b/assets/resources/game/skills/shield.prefab @@ -38,10 +38,13 @@ }, { "__id__": 14 + }, + { + "__id__": 16 } ], "_prefab": { - "__id__": 16 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -286,7 +289,7 @@ "__prefab": { "__id__": 15 }, - "playOnLoad": false, + "playOnLoad": true, "_clips": [ { "__uuid__": "2202bddf-38fc-4b0e-a004-ef962f61f49d", @@ -303,6 +306,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "7cJdSTCj5Eu4vDiD6FPj8P" }, + { + "__type__": "9e0d3yayihFMKm6st+kCG3D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d9m8Z9r0FAn79RIXwYOlkG" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/shoot1.prefab b/assets/resources/game/skills/shoot1.prefab index 45778adc..b559e16e 100644 --- a/assets/resources/game/skills/shoot1.prefab +++ b/assets/resources/game/skills/shoot1.prefab @@ -355,7 +355,7 @@ "fileId": "8ahZv91itPcYJm8S0veHYl" }, { - "__type__": "3a728/XIrpLz7uIWIOQNGox", + "__type__": "f5c0acU9TtA5JBGObMPOZe3", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -370,10 +370,10 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f0PhV1vqlARq7J0VZqN0Mt" + "fileId": "14s7KpM7tDnqD8mx0vPHt/" }, { - "__type__": "f5c0acU9TtA5JBGObMPOZe3", + "__type__": "9e0d3yayihFMKm6st+kCG3D", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -388,7 +388,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "14s7KpM7tDnqD8mx0vPHt/" + "fileId": "cdzG46A0NJkodHq6XNVPWt" }, { "__type__": "cc.PrefabInfo", diff --git a/assets/resources/game/skills/shoot2.prefab b/assets/resources/game/skills/shoot2.prefab index 0c8333a7..f36ddaf9 100644 --- a/assets/resources/game/skills/shoot2.prefab +++ b/assets/resources/game/skills/shoot2.prefab @@ -373,7 +373,7 @@ "fileId": "124to0krdBXqGfGZqRI7GY" }, { - "__type__": "34a04mZHI1DgLIYWdikGBim", + "__type__": "9e0d3yayihFMKm6st+kCG3D", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -388,7 +388,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7cSmvwaElH1K+j9nWUFjlz" + "fileId": "bbI9uBz7dIYI3+V+2q8ahG" }, { "__type__": "cc.PrefabInfo", diff --git a/assets/resources/game/skills/watert.prefab b/assets/resources/game/skills/watert.prefab index a35953bd..34632978 100644 --- a/assets/resources/game/skills/watert.prefab +++ b/assets/resources/game/skills/watert.prefab @@ -41,10 +41,13 @@ }, { "__id__": 18 + }, + { + "__id__": 20 } ], "_prefab": { - "__id__": 20 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -369,6 +372,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "30IyV8mGNDe4xgtVIZXhYJ" }, + { + "__type__": "6a7fejJxHlM5r/TS8IFF1Kq", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 21 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c3g/ZwWHVLApO4IpMsx82J" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/zhanz.prefab b/assets/resources/game/skills/zhanz.prefab index 541b4e24..8e04f58e 100644 --- a/assets/resources/game/skills/zhanz.prefab +++ b/assets/resources/game/skills/zhanz.prefab @@ -102,7 +102,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 50, + "y": 33.697, "z": 0 }, "_lrot": { @@ -235,7 +235,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 35, - "y": 0, + "y": -16.303, "z": 0 }, "_lrot": { @@ -488,7 +488,7 @@ "fileId": "16LYpWaddLdZBFsLWFfMKv" }, { - "__type__": "3a728/XIrpLz7uIWIOQNGox", + "__type__": "9e0d3yayihFMKm6st+kCG3D", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -503,7 +503,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cdldmD9gJNR7CFrZE7t31h" + "fileId": "93yD/FzRtIw4y+dp2MAd1k" }, { "__type__": "cc.PrefabInfo", diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index f519dbb2..a1399ff9 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -21,7 +21,7 @@ sk_uuid:子技能id sk_count:子技能个数 sp_name : 预制体名称 path: 图片地址 -run:number = 0;0：碰撞不消亡 1:碰撞即消亡 +mber = 0;0：碰撞不消亡 1:碰撞即消亡 with:false,debuff: 0depb:50,:无，1：冰，2：灼烧，3：眩晕，4：降低攻击，5：降低hp，6：降低防御，7：吸血，8：击退 */ @@ -47,78 +47,96 @@ export enum skRun { runing = 0, dead = 1, } +/** + * 技能配置集合 + * @description 该文件定义了游戏中各种技能的详细配置信息，包括技能ID、名称、图标、伤害类型等属性。 + * 每个技能都是一个对象，包含多个属性来描述技能的特性和效果。 + * @example + * // 技能ID为6001的技能配置 + * { + * uuid: 6001, + * path: "6001", + * run: 1, + * type: 1, + * tg: 3, + * ... // 其他属性 + * name: "寒冰弹", + * sp_name: "ball_blue", + * info: "释放一个火球术攻击敌人" + * } + */ export const SkillSet={ - 6001:{uuid: 6001,path: "6001",run:1,type:1,tg:3,with:false,debuff:0,depb:50,debtime:2,derate:1,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450, sonsk:0, + 6001:{uuid: 6001,path: "6001",type:1,tg:3,with:false,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450, sonsk:0, name: "寒冰弹",sp_name:"ball_blue",info:"释放一个火球术攻击敌人"}, - 6002:{uuid: 6002,path: "6002",run:1,type:1,tg:3,with:false,debuff:0,depb:50,debtime:2,derate:1,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450, sonsk:0, + 6002:{uuid: 6002,path: "6002",type:1,tg:3,with:false,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450, sonsk:0, name: "火焰弹",sp_name:"ball_red",info:"释放一个火球术攻击敌人"}, - 6003:{uuid: 6003,path: "6003",run:1,type:1,tg:3,with:false,debuff:0,depb:50,debtime:2,derate:1,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450, sonsk:0, + 6003:{uuid: 6003,path: "6003",type:1,tg:3,with:false,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450, sonsk:0, name: "魔法弹",sp_name:"ball_green",info:"释放一个火球术攻击敌人"}, - 6004:{uuid: 6004,path: "6004",run:1,type:1,tg:3,with:false,debuff:0,depb:50,debtime:2,derate:1,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450, sonsk:0, + 6004:{uuid: 6004,path: "6004",type:1,tg:3,with:false,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450, sonsk:0, name: "圣光弹",sp_name:"ball_yellow",info:"释放一个火球术攻击敌人"}, - 6005:{uuid: 6005,path: "6005",run:1,type:1,tg:3,with:false,debuff:0,depb:50,debtime:2,derate:1,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, + 6005:{uuid: 6005,path: "6005",type:1,tg:3,with:false,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:50,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, name: "无形剑气",sp_name:"patk",info:"释放无形剑气攻击前方直线100码的敌人"}, - 6006:{uuid: 6006,path: "6006",run:1,type:1,tg:3,with:false,debuff:0,depb:50,debtime:2,derate:1,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, + 6006:{uuid: 6006,path: "6006",type:1,tg:3,with:false,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, name: "射击",sp_name:"arrow",info:"释放无形剑气攻击前方直线100码的敌人"}, - 6011:{uuid: 6011,path: "6011",run:0,type:1, tg:3,with:false,debuff:0,depb:50,debtime:2,derate:1,in:3,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:0.5,shield:0,speed:100,sonsk:0, + 6011:{uuid: 6011,path: "6011",type:1, tg:3,with:false,debuff:0,depb:0,debtime:0,derate:0,in:3,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:0.5,shield:0,speed:100,sonsk:0, name: "烈火呼吸",sp_name:"firequan",info:"释放烈火剑气攻击前方地方,对前方敌人造成3段伤害"}, - 6012:{uuid: 6012,path: "6012",run:0,type:1, tg:3,with:false,debuff:2,depb:50,debtime:6,derate:1,in:1,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, + 6012:{uuid: 6012,path: "6012",type:1, tg:3,with:false,debuff:2,depb:20,debtime:2,derate:1,in:1,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, name: "大火球",sp_name:"fire",info:"释放有形剑气攻击前方直线300码的敌人"}, - 6013:{uuid: 6013,path: "6013",run:0,type:1, tg:3,with:false,debuff:7,depb:50,debtime:2,derate:0.01,in:10,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, + 6013:{uuid: 6013,path: "6013",type:1, tg:3,with:false,debuff:0,depb:0,debtime:0,derate:0,in:10,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, name: "火墙",sp_name:"fires",info:"释放有形剑气攻击前方直线300码的敌人"}, - 6014:{uuid: 6014,path: "6014",run:0,type:1, tg:3,with:false,debuff:1,depb:50,debtime:2,derate:1,in:1,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, - name: "寒冰箭",sp_name:"ice",info:"释放有形剑气攻击前方直线300码的敌人"}, + 6014:{uuid: 6014,path: "6014",type:1, tg:3,with:false,debuff:1,depb:20,debtime:2,derate:0,in:1,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, + name: "寒冰箭",sp_name:"arrow_blue",info:"释放有形剑气攻击前方直线300码的敌人"}, - 6015:{uuid: 6015,path: "6015",run:0,type:1, tg:3,with:false,debuff:3,depb:50,debtime:6,derate:1,in:1,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, + 6015:{uuid: 6015,path: "6015",type:1, tg:3,with:false,debuff:3,depb:20,debtime:2,derate:0,in:1,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, name: "火焰射击",sp_name:"arrow_yellow",info:"释放有形剑气攻击前方直线300码的敌人"}, - 6016:{uuid: 6016,path: "6016",run:0,type:1, tg:3,with:false,debuff:8,depb:50,debtime:6,derate:1,in:1,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:1,shield:0,speed:300,sonsk:0, + 6016:{uuid: 6016,path: "6016",type:1, tg:3,with:false,debuff:8,depb:50,debtime:1,derate:0,in:1,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:1,shield:0,speed:300,sonsk:0, name: "龙卷风",sp_name:"bwind",info:"释放有形剑气攻击前方直线300码的敌人"}, - 6017:{uuid: 6017,path: "6017",run:0,type:1, tg:2,with:false,debuff:0,depb:50,debtime:2,derate:1,in:5,count:1,def:0,apup:0,ap:100,mhp:0,hp:20,cd:1,shield:0,speed:450, sonsk:0, + 6017:{uuid: 6017,path: "6017",type:1, tg:2,with:false,debuff:0,depb:0,debtime:0,derate:0,in:5,count:1,def:0,apup:0,ap:100,mhp:0,hp:20,cd:1,shield:0,speed:450, sonsk:0, name: "复苏",sp_name:"heath",info:"5秒持续为全体友方恢复施法者最大生命值20%的生命"}, - 6018:{uuid: 6018,path: "6018",run:0,type:1, tg:0,with:false,debuff:0,depb:50,debtime:2,derate:1,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:5,speed:450, sonsk:0, + 6018:{uuid: 6018,path: "6018",type:1, tg:0,with:false,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:5,speed:450, sonsk:0, name: "魔法盾",sp_name:"shield",info:"释放一个寒冰箭攻击敌人"}, - 6019:{uuid: 6019,path: "6019",run:0,type:1, tg:0,with:false,debuff:0,depb:50,debtime:2,derate:1,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450, sonsk:0, + 6019:{uuid: 6019,path: "6019",type:1, tg:0,with:false,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:1,shield:0,speed:450, sonsk:0, name: "狂暴",sp_name:"atkup",info:"释放一个寒冰箭攻击敌人"}, - 6020:{uuid: 6020,path: "6020",run:2,type:2,tg:3,with:false,debuff:0,depb:50,debtime:0,derate:0,in:1,count:1,def:0,apup:0,ap:900,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:6021, + 6020:{uuid: 6020,path: "6020",type:2,tg:3,with:false,debuff:0,depb:0,debtime:0,derate:0,in:1,count:1,def:0,apup:0,ap:900,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:6021, name: "致命射击",sp_name:"shoot1",info:"瞬间对最后排敌人造成致命射击"}, - 6021:{uuid: 6021,path: "6021",run:2,type:2,tg:3,with:false,debuff:0,depb:50,debtime:0,derate:0,in:1,count:1,def:0,apup:0,ap:900,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, + 6021:{uuid: 6021,path: "6021",type:2,tg:3,with:false,debuff:0,depb:0,debtime:0,derate:0,in:1,count:1,def:0,apup:0,ap:900,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, name: "致命射击2",sp_name:"shoot2",info:"释放有形剑气攻击前方直线300码的敌人"}, - 6022:{uuid: 6022,path: "6022",run:0,type:1, tg:3,with:false,debuff:1,depb:50,debtime:2,derate:1,in:1,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, + 6022:{uuid: 6022,path: "6022",type:1, tg:3,with:false,debuff:1,depb:50,debtime:2,derate:0,in:1,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, name: "冰刺",sp_name:"icez",info:"释放有形剑气攻击前方直线300码的敌人"}, - 6023:{uuid: 6023,path: "6023",run:0,type:1, tg:3,with:false,debuff:8,depb:50,debtime:2,derate:1,in:1,count:1,def:0,apup:0,ap:400,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, + 6023:{uuid: 6023,path: "6023",type:1, tg:3,with:false,debuff:8,depb:50,debtime:1,derate:0,in:1,count:1,def:0,apup:0,ap:400,mhp:0,hp:0,cd:1,shield:0,speed:450,sonsk:0, name: "冰墙",sp_name:"icet",info:"释放有形剑气攻击前方直线300码的敌人"}, - 6024:{uuid: 6024,path: "6024",run:0,type:1, tg:3,with:true,debuff:8,depb:50,debtime:2,derate:1,in:2,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:0.5,shield:0,speed:100,sonsk:0, + 6024:{uuid: 6024,path: "6024",type:1, tg:3,with:true,debuff:8,depb:50,debtime:1,derate:0,in:2,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:0.5,shield:0,speed:100,sonsk:0, name: "旋风斩",sp_name:"fwind",info:"释放烈火剑气攻击前方地方,对前方敌人造成3段伤害"}, - 6025:{uuid: 6025,path: "6025",run:1,type:1, tg:3,with:false,debuff:8,depb:50,debtime:2,derate:1,in:3,count:1,def:0,apup:0,ap:500,mhp:0,hp:0,cd:1,shield:0,speed:500,sonsk:0, + 6025:{uuid: 6025,path: "6025",type:1, tg:3,with:false,debuff:8,depb:50,debtime:1,derate:0,in:3,count:1,def:0,apup:0,ap:500,mhp:0,hp:0,cd:1,shield:0,speed:500,sonsk:0, name: "螺旋击",sp_name:"fireball",info:"释放烈火剑气攻击前方地方,对前方敌人造成3段伤害"}, - 6026:{uuid: 6026,path: "6026",run:0,type:1, tg:3,with:false,debuff:8,depb:50,debtime:2,derate:1,in:3,count:1,def:0,apup:0,ap:500,mhp:0,hp:0,cd:1,shield:0,speed:500,sonsk:0, + 6026:{uuid: 6026,path: "6026",type:1, tg:3,with:false,debuff:8,depb:50,debtime:2,derate:0,in:3,count:1,def:0,apup:0,ap:500,mhp:0,hp:0,cd:1,shield:0,speed:500,sonsk:0, name: "潮汐",sp_name:"watert",info:"释放烈火剑气攻击前方地方,对前方敌人造成3段伤害"}, - 6027:{uuid: 6027,path: "6027",run:0,type:1, tg:3,with:false,debuff:8,depb:50,debtime:2,derate:1,in:3,count:1,def:0,apup:0,ap:500,mhp:0,hp:0,cd:1,shield:0,speed:500,sonsk:0, + 6027:{uuid: 6027,path: "6027",type:1, tg:3,with:false,debuff:8,depb:100,debtime:2,derate:0,in:3,count:1,def:0,apup:0,ap:500,mhp:0,hp:0,cd:1,shield:0,speed:500,sonsk:0, name: "战斗冲击",sp_name:"zhanz",info:"释放烈火剑气攻击前方地方,对前方敌人造成3段伤害"}, - 6028:{uuid: 6028,path: "6028",run:0,type:1, tg:0,with:false,debuff:0,depb:50,debtime:2,derate:1,in:2,count:1,def:0,apup:0,ap:100,mhp:0,hp:10,cd:2,shield:2,speed:450, sonsk:0, - name: "自然庇佑",sp_name:"heath2",info:"5秒持续为全体友方恢复施法者最大生命值10%的生命,和施法者200%攻击力的护甲"}, + 6028:{uuid: 6028,path: "6028",type:1, tg:0,with:false,debuff:0,depb:0,debtime:0,derate:0,in:2,count:1,def:0,apup:0,ap:100,mhp:0,hp:10,cd:2,shield:2,speed:450, sonsk:0, + name: "自然庇佑",sp_name:"heath2",info:"为全体友方恢复施法者最大生命值10%的生命,和抵御2次攻击的护盾"}, } export const MSklist = [6001,6002] diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 3e286028..aedc64f3 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -334,6 +334,13 @@ export class HeroViewComp extends CCComp { l_hp=l_hp*(100+luck)/100 return Math.ceil(l_hp) } + /** + * 检查并处理英雄受到的减益效果（debuff）。 + * 根据技能的不同减益类型，执行相应的逻辑，如冰冻、燃烧等。 + * + * @param skill - 包含减益效果信息的技能对象 + * @param l_hp - 可选参数，表示英雄的当前生命值，默认为0 + */ check_debuff(skill:any,l_hp:number=0){ console.log(this.hero_name+":"+this.uuid+"check_debuff "+skill.debuff); if(skill.debuff == 0) return diff --git a/assets/script/game/skills/AnmEndCom.ts b/assets/script/game/skills/AnmEndCom.ts new file mode 100644 index 00000000..a99fb3df --- /dev/null +++ b/assets/script/game/skills/AnmEndCom.ts @@ -0,0 +1,14 @@ +import { _decorator, Component, Node } from 'cc'; +const { ccclass, property } = _decorator; + +@ccclass('AnmEndCom') +export class AnmEndCom extends Component { + start() { + + } + + update(deltaTime: number) { + + } +} + diff --git a/assets/script/game/skills/OnceCom.ts.meta b/assets/script/game/skills/AnmEndCom.ts.meta similarity index 70% rename from assets/script/game/skills/OnceCom.ts.meta rename to assets/script/game/skills/AnmEndCom.ts.meta index b147809d..bcea9199 100644 --- a/assets/script/game/skills/OnceCom.ts.meta +++ b/assets/script/game/skills/AnmEndCom.ts.meta @@ -2,7 +2,7 @@ "ver": "4.0.23", "importer": "typescript", "imported": true, - "uuid": "34a04999-1c8d-4380-b218-59d8a41818a6", + "uuid": "9a6c0cbd-2b5b-4ecd-85d3-c017de7a5b2a", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/script/game/skills/OnceCom.ts b/assets/script/game/skills/EndAnmCom.ts similarity index 74% rename from assets/script/game/skills/OnceCom.ts rename to assets/script/game/skills/EndAnmCom.ts index c8e8ad59..b35f6790 100644 --- a/assets/script/game/skills/OnceCom.ts +++ b/assets/script/game/skills/EndAnmCom.ts @@ -2,13 +2,15 @@ import { _decorator, Animation, Component, Node } from 'cc'; import { SkillCom } from './SkillCom'; const { ccclass, property } = _decorator; -@ccclass('OnceCom') -export class OnceCom extends Component { - start() { +@ccclass('EndAnmCom') +export class EndAnmCom extends Component { + start() { let anim = this.node.getComponent(Animation); + console.log("动画",anim) anim.on(Animation.EventType.FINISHED, this.onAnimationFinished, this); } onAnimationFinished(){ + console.log("动画播放完毕") let bese = this.node.getComponent(SkillCom) bese.is_destroy = true } diff --git a/assets/script/game/skills/NoRunCom.ts.meta b/assets/script/game/skills/EndAnmCom.ts.meta similarity index 70% rename from assets/script/game/skills/NoRunCom.ts.meta rename to assets/script/game/skills/EndAnmCom.ts.meta index 22458cc0..af68a810 100644 --- a/assets/script/game/skills/NoRunCom.ts.meta +++ b/assets/script/game/skills/EndAnmCom.ts.meta @@ -2,7 +2,7 @@ "ver": "4.0.23", "importer": "typescript", "imported": true, - "uuid": "3a728fd7-22ba-4bcf-bb88-588390346a31", + "uuid": "9e0d3c9a-ca28-4530-a9ba-b2dfa4086dc3", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/script/game/skills/EndBoxCom.ts b/assets/script/game/skills/EndBoxCom.ts new file mode 100644 index 00000000..106be317 --- /dev/null +++ b/assets/script/game/skills/EndBoxCom.ts @@ -0,0 +1,20 @@ +import { _decorator, Collider2D, Component, Contact2DType, Node } from 'cc'; +import { SkillCom } from './SkillCom'; +const { ccclass, property } = _decorator; + +@ccclass('EndBoxCom') +export class EndBoxCom extends Component { + base:SkillCom = null + start() { + this.base =this.node.getComponent(SkillCom) + let collider = this.getComponent(Collider2D); + if (collider) { + collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this); + } + } + onBeginContact (seCol: Collider2D, otCol: Collider2D) { + if(otCol.group != seCol.group&&otCol.tag ==0)this.base.is_destroy=true + } +} + + diff --git a/assets/script/game/skills/EndBoxCom.ts.meta b/assets/script/game/skills/EndBoxCom.ts.meta new file mode 100644 index 00000000..4c56598d --- /dev/null +++ b/assets/script/game/skills/EndBoxCom.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "2332add2-8701-4636-bd89-184f6f4893de", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/skills/EndLineCom.ts b/assets/script/game/skills/EndLineCom.ts new file mode 100644 index 00000000..9b38a037 --- /dev/null +++ b/assets/script/game/skills/EndLineCom.ts @@ -0,0 +1,22 @@ +import { _decorator, Component, Node } from 'cc'; +import { SkillCom } from './SkillCom'; +import { smc } from '../common/SingletonModuleComp'; +const { ccclass, property } = _decorator; + +@ccclass('EndLineCom') +export class EndLineCom extends Component { + base:SkillCom = null + start() { + this.base =this.node.getComponent(SkillCom) + + } + + update(deltaTime: number) { + if(smc.mission.pause) return + if(this.node.position.x > 500 || this.node.position.x<-500){ + this.base.is_destroy = true + } + } +} + + diff --git a/assets/script/game/skills/EndLineCom.ts.meta b/assets/script/game/skills/EndLineCom.ts.meta new file mode 100644 index 00000000..dfbef705 --- /dev/null +++ b/assets/script/game/skills/EndLineCom.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "c92ad7af-330c-4161-86c5-8d5736e5e57d", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/skills/EndTimeCom.ts b/assets/script/game/skills/EndTimeCom.ts new file mode 100644 index 00000000..281ce72f --- /dev/null +++ b/assets/script/game/skills/EndTimeCom.ts @@ -0,0 +1,23 @@ +import { _decorator, Component, Node } from 'cc'; +import { SkillCom } from './SkillCom'; +import { smc } from '../common/SingletonModuleComp'; +const { ccclass, property } = _decorator; + +@ccclass('EndTimeCom') +export class EndTimeCom extends Component { + time:number = 0 + base:SkillCom = null + start() { + this.base =this.node.getComponent(SkillCom) + } + + update(deltaTime: number) { + if(smc.mission.pause) return + this.time+=deltaTime + if(this.time>=this.base.in_time){ + this.base.is_destroy = true + } + } +} + + diff --git a/assets/script/game/skills/EndTimeCom.ts.meta b/assets/script/game/skills/EndTimeCom.ts.meta new file mode 100644 index 00000000..48377285 --- /dev/null +++ b/assets/script/game/skills/EndTimeCom.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "6a7fe8c9-c479-4ce6-bfd3-4bc2051752aa", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/skills/LineCom.ts b/assets/script/game/skills/LineCom.ts index cf42e72e..c2f21fd1 100644 --- a/assets/script/game/skills/LineCom.ts +++ b/assets/script/game/skills/LineCom.ts @@ -14,9 +14,6 @@ export class LineCom extends Component { update(deltaTime: number) { if(smc.mission.pause) return this.node.setPosition(this.node.position.x+this.base.speed*deltaTime,this.node.position.y,this.node.position.z) - if(this.node.position.x>1000||this.node.position.x<-1000){ - this.base.is_destroy = true - } } } diff --git a/assets/script/game/skills/LineMCom.ts b/assets/script/game/skills/LineMCom.ts index ead2879c..ff6cfbfe 100644 --- a/assets/script/game/skills/LineMCom.ts +++ b/assets/script/game/skills/LineMCom.ts @@ -14,7 +14,6 @@ export class LineMCom extends Component { } update(deltaTime: number) { - if(smc.mission.pause) return if(smc.mission.pause) return this.cd+=deltaTime if(this.cd >= this.base.cd){ @@ -23,14 +22,8 @@ export class LineMCom extends Component { this.node.active = true this.cd=0 } - this.time+=deltaTime - if(this.time>=this.base.in_time){ - this.base.is_destroy = true - } this.node.setPosition(this.node.position.x+this.base.speed*deltaTime,this.node.position.y,this.node.position.z) - if(this.node.position.x>1000||this.node.position.x<-1000){ - this.base.is_destroy = true - } + } } diff --git a/assets/script/game/skills/NoRunCom.ts b/assets/script/game/skills/NoRunCom.ts deleted file mode 100644 index 318378ac..00000000 --- a/assets/script/game/skills/NoRunCom.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { _decorator, Component, Node, tween, Vec3 } from 'cc'; -import { SkillCom } from './SkillCom'; -import { SkillSet } from '../common/config/SkillSet'; -const { ccclass, property } = _decorator; - -@ccclass('NoRunCom') -export class NoRunCom extends Component { - base:SkillCom - start() { - this.base =this.node.getComponent(SkillCom) - - } - - update(deltaTime: number) { - - - } -} - - diff --git a/assets/script/game/skills/Skill.ts b/assets/script/game/skills/Skill.ts index c542a718..3e3ffa97 100644 --- a/assets/script/game/skills/Skill.ts +++ b/assets/script/game/skills/Skill.ts @@ -56,7 +56,6 @@ export class Skill extends ecs.Entity { sv.debuff = SkillSet[uuid].debuff; sv.depb = SkillSet[uuid].depb; sv.derate = SkillSet[uuid].derate; - sv.run = SkillSet[uuid].run; sv.is_crit=is_crit sv.crit_add=crit_add // node.setScale(v3(node.scale.x*scale,node.scale.y)) diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts index af7aad06..2b43ee2a 100644 --- a/assets/script/game/skills/SkillCom.ts +++ b/assets/script/game/skills/SkillCom.ts @@ -60,9 +60,6 @@ export class SkillCom extends CCComp { onBeginContact (seCol: Collider2D, otCol: Collider2D, contact: IPhysics2DContact | null) { if(otCol.group != seCol.group&&otCol.tag ==0){ this.atk_count+=1 - if(this.run==1 ){ - this.is_destroy=true - } } if(otCol.group == seCol.group&&otCol.tag ==0&&(this.tg==2||this.tg==0)){ this.to_console("skill onBeginContact 是对自己人的buff",seCol,otCol) diff --git a/assets/script/game/skills/timedCom.ts b/assets/script/game/skills/timedCom.ts index 4f5f4192..2c163fbb 100644 --- a/assets/script/game/skills/timedCom.ts +++ b/assets/script/game/skills/timedCom.ts @@ -14,7 +14,7 @@ export class timedCom extends Component { } update(deltaTime: number) { - this.time = this.time - deltaTime; + this.time -= deltaTime; if(this.time <= 0) { this.node.destroy()