diff --git a/assets/resources/game/skills/anm/dfireball.json b/assets/resources/game/skills/anm/dfireball.json index 4eed5181..7596da91 100644 --- a/assets/resources/game/skills/anm/dfireball.json +++ b/assets/resources/game/skills/anm/dfireball.json @@ -1,10 +1,10 @@ { -"skeleton": { "hash": "C+xetSmWUZ/pY/WUAPMUn372/GY=", "spine": "3.8.75", "x": -41, "y": -40, "width": 83, "height": 80 }, +"skeleton": { "hash": "oagK1aPVJpwE+E/ur2X7LwzEXFw=", "spine": "3.8.75", "x": -41, "y": -40, "width": 83, "height": 80 }, "bones": [ { "name": "root" } ], "slots": [ - { "name": "WPS图片批量处理/Flame_circle_loop_01", "bone": "root", "attachment": "WPS图片批量处理/Magic_Sphere_normal_07" } + { "name": "WPS图片批量处理/Flame_circle_loop_01", "bone": "root", "attachment": "WPS图片批量处理/Magic_Sphere_normal_00" } ], "skins": [ { @@ -28,7 +28,6 @@ "slots": { "WPS图片批量处理/Flame_circle_loop_01": { "attachment": [ - { "name": "WPS图片批量处理/Magic_Sphere_normal_00" }, { "time": 0.0667, "name": "WPS图片批量处理/Magic_Sphere_normal_01" }, { "time": 0.1333, "name": "WPS图片批量处理/Magic_Sphere_normal_02" }, { "time": 0.2, "name": "WPS图片批量处理/Magic_Sphere_normal_03" }, diff --git a/assets/resources/game/skills/anm/greenball.atlas b/assets/resources/game/skills/anm/greenball.atlas new file mode 100644 index 00000000..44909c71 --- /dev/null +++ b/assets/resources/game/skills/anm/greenball.atlas @@ -0,0 +1,118 @@ + +greenball.png +size: 315,484 +format: RGBA8888 +filter: Linear,Linear +repeat: none +WPS图片批量处理(6)/Magic_Sphere_green_00 + rotate: true + xy: 2, 178 + size: 101, 107 + orig: 119, 119 + offset: 9, 2 + index: -1 +WPS图片批量处理(6)/Magic_Sphere_green_01 + rotate: false + xy: 2, 78 + size: 104, 98 + orig: 119, 119 + offset: 4, 8 + index: -1 +WPS图片批量处理(6)/Magic_Sphere_green_02 + rotate: false + xy: 2, 380 + size: 117, 102 + orig: 119, 119 + offset: 0, 7 + index: -1 +WPS图片批量处理(6)/Magic_Sphere_green_03 + rotate: false + xy: 121, 381 + size: 114, 101 + orig: 119, 119 + offset: 2, 9 + index: -1 +WPS图片批量处理(6)/Magic_Sphere_green_04 + rotate: true + xy: 108, 74 + size: 100, 101 + orig: 119, 119 + offset: 8, 10 + index: -1 +WPS图片批量处理(6)/Magic_Sphere_green_05 + rotate: true + xy: 111, 176 + size: 100, 106 + orig: 119, 119 + offset: 9, 6 + index: -1 +WPS图片批量处理(6)/Magic_Sphere_green_06 + rotate: true + xy: 121, 278 + size: 101, 111 + orig: 119, 119 + offset: 9, 1 + index: -1 +WPS图片批量处理(6)/Magic_Sphere_green_07 + rotate: true + xy: 2, 281 + size: 97, 111 + orig: 119, 119 + offset: 10, 1 + index: -1 +WPS图片批量处理/Magic_Sphere_normal_00 + rotate: true + xy: 237, 411 + size: 71, 76 + orig: 83, 80 + offset: 7, 1 + index: -1 +WPS图片批量处理/Magic_Sphere_normal_01 + rotate: false + xy: 2, 5 + size: 74, 71 + orig: 83, 80 + offset: 3, 5 + index: -1 +WPS图片批量处理/Magic_Sphere_normal_02 + rotate: false + xy: 219, 192 + size: 83, 72 + orig: 83, 80 + offset: 0, 5 + index: -1 +WPS图片批量处理/Magic_Sphere_normal_03 + rotate: false + xy: 219, 118 + size: 80, 72 + orig: 83, 80 + offset: 2, 6 + index: -1 +WPS图片批量处理/Magic_Sphere_normal_04 + rotate: true + xy: 78, 2 + size: 70, 72 + orig: 83, 80 + offset: 6, 7 + index: -1 +WPS图片批量处理/Magic_Sphere_normal_05 + rotate: true + xy: 237, 339 + size: 70, 75 + orig: 83, 80 + offset: 7, 4 + index: -1 +WPS图片批量处理/Magic_Sphere_normal_06 + rotate: true + xy: 234, 266 + size: 71, 79 + orig: 83, 80 + offset: 7, 0 + index: -1 +WPS图片批量处理/Magic_Sphere_normal_07 + rotate: true + xy: 211, 47 + size: 69, 79 + orig: 83, 80 + offset: 7, 0 + index: -1 diff --git a/assets/resources/game/skills/anm/greenball.atlas.meta b/assets/resources/game/skills/anm/greenball.atlas.meta new file mode 100644 index 00000000..7d5725f1 --- /dev/null +++ b/assets/resources/game/skills/anm/greenball.atlas.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.1", + "importer": "*", + "imported": true, + "uuid": "0adb40db-168b-4de1-b64e-4fe5a7a54054", + "files": [ + ".atlas", + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/anm/greenball.json b/assets/resources/game/skills/anm/greenball.json new file mode 100644 index 00000000..f0f50329 --- /dev/null +++ b/assets/resources/game/skills/anm/greenball.json @@ -0,0 +1,53 @@ +{ +"skeleton": { "hash": "LqKII4IPW4Y42LmTgoyynQYqgOU=", "spine": "3.8.75", "x": -59, "y": -59, "width": 119, "height": 119 }, +"bones": [ + { "name": "root" } +], +"slots": [ + { "name": "WPS图片批量处理/Flame_circle_loop_01", "bone": "root", "attachment": "WPS图片批量处理(6)/Magic_Sphere_green_07" } +], +"skins": [ + { + "name": "default", + "attachments": { + "WPS图片批量处理/Flame_circle_loop_01": { + "WPS图片批量处理(6)/Magic_Sphere_green_00": { "x": 0.5, "y": 0.5, "width": 119, "height": 119 }, + "WPS图片批量处理(6)/Magic_Sphere_green_01": { "x": 0.5, "y": 0.5, "width": 119, "height": 119 }, + "WPS图片批量处理(6)/Magic_Sphere_green_02": { "x": 0.5, "y": 0.5, "width": 119, "height": 119 }, + "WPS图片批量处理(6)/Magic_Sphere_green_03": { "x": 0.5, "y": 0.5, "width": 119, "height": 119 }, + "WPS图片批量处理(6)/Magic_Sphere_green_04": { "x": 0.5, "y": 0.5, "width": 119, "height": 119 }, + "WPS图片批量处理(6)/Magic_Sphere_green_05": { "x": 0.5, "y": 0.5, "width": 119, "height": 119 }, + "WPS图片批量处理(6)/Magic_Sphere_green_06": { "x": 0.5, "y": 0.5, "width": 119, "height": 119 }, + "WPS图片批量处理(6)/Magic_Sphere_green_07": { "x": 0.5, "y": 0.5, "width": 119, "height": 119 }, + "WPS图片批量处理/Magic_Sphere_normal_00": { "x": 0.5, "width": 83, "height": 80 }, + "WPS图片批量处理/Magic_Sphere_normal_01": { "x": 0.5, "width": 83, "height": 80 }, + "WPS图片批量处理/Magic_Sphere_normal_02": { "x": 0.5, "width": 83, "height": 80 }, + "WPS图片批量处理/Magic_Sphere_normal_03": { "x": 0.5, "width": 83, "height": 80 }, + "WPS图片批量处理/Magic_Sphere_normal_04": { "x": 0.5, "width": 83, "height": 80 }, + "WPS图片批量处理/Magic_Sphere_normal_05": { "x": 0.5, "width": 83, "height": 80 }, + "WPS图片批量处理/Magic_Sphere_normal_06": { "x": 0.5, "width": 83, "height": 80 }, + "WPS图片批量处理/Magic_Sphere_normal_07": { "x": 0.5, "width": 83, "height": 80 } + } + } + } +], +"animations": { + "show": { + "slots": { + "WPS图片批量处理/Flame_circle_loop_01": { + "attachment": [ + { "name": "WPS图片批量处理(6)/Magic_Sphere_green_00" }, + { "time": 0.0667, "name": "WPS图片批量处理(6)/Magic_Sphere_green_01" }, + { "time": 0.1333, "name": "WPS图片批量处理(6)/Magic_Sphere_green_02" }, + { "time": 0.2, "name": "WPS图片批量处理(6)/Magic_Sphere_green_03" }, + { "time": 0.2667, "name": "WPS图片批量处理(6)/Magic_Sphere_green_04" }, + { "time": 0.3333, "name": "WPS图片批量处理(6)/Magic_Sphere_green_05" }, + { "time": 0.4, "name": "WPS图片批量处理(6)/Magic_Sphere_green_06" }, + { "time": 0.4667, "name": "WPS图片批量处理(6)/Magic_Sphere_green_07" }, + { "time": 0.5333, "name": "WPS图片批量处理(6)/Magic_Sphere_green_00" } + ] + } + } + } +} +} \ No newline at end of file diff --git a/assets/resources/game/skills/anm/greenball.json.meta b/assets/resources/game/skills/anm/greenball.json.meta new file mode 100644 index 00000000..99800b5a --- /dev/null +++ b/assets/resources/game/skills/anm/greenball.json.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.2.6", + "importer": "spine-data", + "imported": true, + "uuid": "8c7136ce-d242-40b3-be9c-e765c945037c", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/anm/greenball.png b/assets/resources/game/skills/anm/greenball.png new file mode 100644 index 00000000..e3a001ce Binary files /dev/null and b/assets/resources/game/skills/anm/greenball.png differ diff --git a/assets/resources/game/skills/anm/greenball.png.meta b/assets/resources/game/skills/anm/greenball.png.meta new file mode 100644 index 00000000..4bf1ca6b --- /dev/null +++ b/assets/resources/game/skills/anm/greenball.png.meta @@ -0,0 +1,42 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "3023b780-3455-4eeb-83fd-c6366a805367", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "3023b780-3455-4eeb-83fd-c6366a805367@6c48a", + "displayName": "greenball", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "3023b780-3455-4eeb-83fd-c6366a805367", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "texture", + "fixAlphaTransparencyArtifacts": false, + "redirect": "3023b780-3455-4eeb-83fd-c6366a805367@6c48a" + } +} diff --git a/assets/resources/game/skills/arrow.prefab b/assets/resources/game/skills/arrow.prefab index 3cec5fc3..1a44200a 100644 --- a/assets/resources/game/skills/arrow.prefab +++ b/assets/resources/game/skills/arrow.prefab @@ -337,7 +337,7 @@ "speed": 600, "controlPointSide": 1, "controlPointOffset": 0.7, - "controlPointRandomness": 0.3, + "controlPointRandomness": 0.1, "autoRotate": true, "showTrajectory": false, "trajectoryColor": { diff --git a/assets/resources/game/skills/arrow_blue.prefab b/assets/resources/game/skills/arrow_blue.prefab index 07ca353b..faeec096 100644 --- a/assets/resources/game/skills/arrow_blue.prefab +++ b/assets/resources/game/skills/arrow_blue.prefab @@ -38,10 +38,13 @@ }, { "__id__": 16 + }, + { + "__id__": 18 } ], "_prefab": { - "__id__": 18 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -351,6 +354,40 @@ "__type__": "cc.CompPrefabInfo", "fileId": "b4VdvbfTNHrqPX5FRvy1Ox" }, + { + "__type__": "f680dkagx9PmbfqtF463/Ua", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "speed": 600, + "controlPointSide": 1, + "controlPointOffset": 0.7, + "controlPointRandomness": 0.1, + "autoRotate": true, + "showTrajectory": false, + "trajectoryColor": { + "__type__": "cc.Color", + "r": 0, + "g": 255, + "b": 0, + "a": 255 + }, + "trajectoryWidth": 3, + "easing": "linear", + "rotationSmoothness": 0.6, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b3U9tP7eNKpaASpzl4z9tQ" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/arrow_yellow.prefab b/assets/resources/game/skills/arrow_yellow.prefab index 85e5b494..e4e1cb23 100644 --- a/assets/resources/game/skills/arrow_yellow.prefab +++ b/assets/resources/game/skills/arrow_yellow.prefab @@ -35,10 +35,13 @@ }, { "__id__": 16 + }, + { + "__id__": 18 } ], "_prefab": { - "__id__": 18 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -351,6 +354,40 @@ "__type__": "cc.CompPrefabInfo", "fileId": "eaepj2mQFP9qzyzp0v4cor" }, + { + "__type__": "f680dkagx9PmbfqtF463/Ua", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "speed": 600, + "controlPointSide": 1, + "controlPointOffset": 0.7, + "controlPointRandomness": 0.1, + "autoRotate": true, + "showTrajectory": false, + "trajectoryColor": { + "__type__": "cc.Color", + "r": 0, + "g": 255, + "b": 0, + "a": 255 + }, + "trajectoryWidth": 3, + "easing": "linear", + "rotationSmoothness": 0.6, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "62jhe26chBNZxIACmVw4ml" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/ball_blue.prefab b/assets/resources/game/skills/ball_blue.prefab deleted file mode 100644 index 67705135..00000000 --- a/assets/resources/game/skills/ball_blue.prefab +++ /dev/null @@ -1,403 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "ball_blue", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "ball_blue", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - } - ], - "_active": true, - "_components": [ - { - "__id__": 8 - }, - { - "__id__": 10 - }, - { - "__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": [], - "_active": true, - "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - } - ], - "_prefab": { - "__id__": 7 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 0.8, - "y": 0.8, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 4 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 30, - "height": 30 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "43ucwKXvZIjpuRMb6AMdcx" - }, - { - "__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__": "093403fd-fec9-42ef-b952-5831234ff06e@a5c8a", - "__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": "57hoD/3wpHU7ipwKMwKD/k" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "b05wpkPXFJqK6/PzoIxCfr", - "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": 30, - "height": 30 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.49664333316829656, - "y": 0.5156666649712457 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "63NP9yq3hEUKD/OZZZ5t7x" - }, - { - "__type__": "45646oIyIdA24W+0c5rdELD", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8ahZv91itPcYJm8S0veHYl" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "playOnLoad": true, - "_clips": [ - { - "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0cIZpMAklNUpGWSkPm4J6y" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0.5 - }, - "_size": { - "__type__": "cc.Size", - "width": 19.8, - "height": 18 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c8a223JedHta3KLqsLOyj0" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "enabledContactListener": true, - "bullet": false, - "awakeOnLoad": true, - "_group": 4, - "_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": "aeGmwClnlOP5eMPhPy+kHt" - }, - { - "__type__": "f680dkagx9PmbfqtF463/Ua", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 19 - }, - "speed": 600, - "controlPointSide": 1, - "controlPointOffset": 0.7, - "controlPointRandomness": 0.3, - "autoRotate": true, - "showTrajectory": true, - "trajectoryColor": { - "__type__": "cc.Color", - "r": 0, - "g": 255, - "b": 0, - "a": 255 - }, - "trajectoryWidth": 3, - "easing": "linear", - "rotationSmoothness": 0.6, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "51lZK4JLxLpqRH1+kFlYy9" - }, - { - "__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/ball_blue.prefab.meta b/assets/resources/game/skills/ball_blue.prefab.meta deleted file mode 100644 index df42b47c..00000000 --- a/assets/resources/game/skills/ball_blue.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "6656d91b-eded-485c-b043-13b9dfdfb92e", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "ball_blue" - } -} diff --git a/assets/resources/game/skills/ball_green.prefab b/assets/resources/game/skills/ball_green.prefab deleted file mode 100644 index e73bca44..00000000 --- a/assets/resources/game/skills/ball_green.prefab +++ /dev/null @@ -1,366 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "ball_green", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "ball_green", - "_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": "skill", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - } - ], - "_prefab": { - "__id__": 7 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 4 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "43ucwKXvZIjpuRMb6AMdcx" - }, - { - "__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__": "093403fd-fec9-42ef-b952-5831234ff06e@09b0c", - "__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": "57hoD/3wpHU7ipwKMwKD/k" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "b05wpkPXFJqK6/PzoIxCfr", - "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": 40, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.49664333316829656, - "y": 0.5156666649712457 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "63NP9yq3hEUKD/OZZZ5t7x" - }, - { - "__type__": "45646oIyIdA24W+0c5rdELD", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8ahZv91itPcYJm8S0veHYl" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "playOnLoad": true, - "_clips": [ - { - "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0cIZpMAklNUpGWSkPm4J6y" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -0.7, - "y": 0.3 - }, - "_size": { - "__type__": "cc.Size", - "width": 29.3, - "height": 26 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "7eIju4gaJLop5DzHQBT0dg" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "enabledContactListener": true, - "bullet": false, - "awakeOnLoad": true, - "_group": 4, - "_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": "6eROURlYNGQ5UOwNRqvK1k" - }, - { - "__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/ball_green.prefab.meta b/assets/resources/game/skills/ball_green.prefab.meta deleted file mode 100644 index 9aa515cc..00000000 --- a/assets/resources/game/skills/ball_green.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "352489cb-440e-428a-9c1a-8ad7447f39f2", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "ball_green" - } -} diff --git a/assets/resources/game/skills/ball_yellow.prefab b/assets/resources/game/skills/ball_yellow.prefab deleted file mode 100644 index c8d6daf7..00000000 --- a/assets/resources/game/skills/ball_yellow.prefab +++ /dev/null @@ -1,366 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "ball_yellow", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "ball_yellow", - "_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": "skill", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - } - ], - "_prefab": { - "__id__": 7 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 4 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "43ucwKXvZIjpuRMb6AMdcx" - }, - { - "__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__": "093403fd-fec9-42ef-b952-5831234ff06e@68081", - "__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": "57hoD/3wpHU7ipwKMwKD/k" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "b05wpkPXFJqK6/PzoIxCfr", - "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": 40, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.49664333316829656, - "y": 0.5156666649712457 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "63NP9yq3hEUKD/OZZZ5t7x" - }, - { - "__type__": "45646oIyIdA24W+0c5rdELD", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8ahZv91itPcYJm8S0veHYl" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "playOnLoad": true, - "_clips": [ - { - "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0cIZpMAklNUpGWSkPm4J6y" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -0.7, - "y": 0.3 - }, - "_size": { - "__type__": "cc.Size", - "width": 29.3, - "height": 26 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8elUjyXzpHn626+zcDkzYc" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "enabledContactListener": true, - "bullet": false, - "awakeOnLoad": true, - "_group": 4, - "_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": "07zMwBbTFHuLCj/E5XNMVv" - }, - { - "__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/ball_yellow.prefab.meta b/assets/resources/game/skills/ball_yellow.prefab.meta deleted file mode 100644 index 4d95164b..00000000 --- a/assets/resources/game/skills/ball_yellow.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "48079561-e1d2-4c77-8c49-deb615692a5c", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "ball_yellow" - } -} diff --git a/assets/resources/game/skills/fire.prefab b/assets/resources/game/skills/fire.prefab index 5cbacb13..1410e389 100644 --- a/assets/resources/game/skills/fire.prefab +++ b/assets/resources/game/skills/fire.prefab @@ -32,10 +32,13 @@ }, { "__id__": 12 + }, + { + "__id__": 14 } ], "_prefab": { - "__id__": 14 + "__id__": 16 }, "_lpos": { "__type__": "cc.Vec3", @@ -277,6 +280,40 @@ "__type__": "cc.CompPrefabInfo", "fileId": "16LYpWaddLdZBFsLWFfMKv" }, + { + "__type__": "f680dkagx9PmbfqtF463/Ua", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "speed": 600, + "controlPointSide": 1, + "controlPointOffset": 0.7, + "controlPointRandomness": 0.1, + "autoRotate": true, + "showTrajectory": false, + "trajectoryColor": { + "__type__": "cc.Color", + "r": 0, + "g": 255, + "b": 0, + "a": 255 + }, + "trajectoryWidth": 3, + "easing": "linear", + "rotationSmoothness": 0.6, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "29TlPeJcdIy4wZXKhtLbdr" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/fireball.prefab b/assets/resources/game/skills/fireball.prefab index a4a7f645..6fc58749 100644 --- a/assets/resources/game/skills/fireball.prefab +++ b/assets/resources/game/skills/fireball.prefab @@ -29,10 +29,13 @@ }, { "__id__": 10 + }, + { + "__id__": 12 } ], "_prefab": { - "__id__": 12 + "__id__": 14 }, "_lpos": { "__type__": "cc.Vec3", @@ -245,6 +248,40 @@ "__type__": "cc.CompPrefabInfo", "fileId": "8ahZv91itPcYJm8S0veHYl" }, + { + "__type__": "f680dkagx9PmbfqtF463/Ua", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "speed": 600, + "controlPointSide": 1, + "controlPointOffset": 0.7, + "controlPointRandomness": 0.1, + "autoRotate": true, + "showTrajectory": false, + "trajectoryColor": { + "__type__": "cc.Color", + "r": 0, + "g": 255, + "b": 0, + "a": 255 + }, + "trajectoryWidth": 3, + "easing": "linear", + "rotationSmoothness": 0.6, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "efNVlDVd9Cbo6YVaoq8xgm" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/firequan.prefab b/assets/resources/game/skills/firequan.prefab index c18be5e4..a53843ec 100644 --- a/assets/resources/game/skills/firequan.prefab +++ b/assets/resources/game/skills/firequan.prefab @@ -29,16 +29,10 @@ }, { "__id__": 10 - }, - { - "__id__": 12 - }, - { - "__id__": 14 } ], "_prefab": { - "__id__": 16 + "__id__": 12 }, "_lpos": { "__type__": "cc.Vec3", @@ -251,42 +245,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "8ahZv91itPcYJm8S0veHYl" }, - { - "__type__": "6a7fejJxHlM5r/TS8IFF1Kq", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": false, - "__prefab": { - "__id__": 13 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4c47c40/5NYqQ9BorJuPcK" - }, - { - "__type__": "20503VOc7ZA84sbp8G72pxZ", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": false, - "__prefab": { - "__id__": 15 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "9eF2PAF/ZE4oLd18R/CcWz" - }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/ball_red.prefab b/assets/resources/game/skills/greenball.prefab similarity index 79% rename from assets/resources/game/skills/ball_red.prefab rename to assets/resources/game/skills/greenball.prefab index 607b541f..36ab7fcf 100644 --- a/assets/resources/game/skills/ball_red.prefab +++ b/assets/resources/game/skills/greenball.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "ball_red", + "_name": "greenball", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "ball_red", + "_name": "greenball", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -74,7 +74,7 @@ }, { "__type__": "cc.Node", - "_name": "skill", + "_name": "anm", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.3, + "y": 0.3, "z": 1 }, "_mobility": 0, @@ -136,13 +136,13 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 40, - "height": 40 + "width": 119, + "height": 119 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 + "x": 0.4957983193277311, + "y": 0.4957983193277311 }, "_id": "" }, @@ -151,7 +151,7 @@ "fileId": "43ucwKXvZIjpuRMb6AMdcx" }, { - "__type__": "cc.Sprite", + "__type__": "sp.Skeleton", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -172,28 +172,28 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@4fe96", - "__expectedType__": "cc.SpriteFrame" + "_skeletonData": { + "__uuid__": "8c7136ce-d242-40b3-be9c-e765c945037c", + "__expectedType__": "sp.SkeletonData" }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, + "defaultSkin": "default", + "defaultAnimation": "show", + "_premultipliedAlpha": true, + "_timeScale": 1, + "_preCacheMode": 0, + "_cacheMode": 0, + "_sockets": [], + "_useTint": false, + "_debugMesh": false, + "_debugBones": false, + "_debugSlots": false, + "_enableBatch": false, + "loop": true, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "57hoD/3wpHU7ipwKMwKD/k" + "fileId": "af8Wje4GNK8aWTCWX5QsLG" }, { "__type__": "cc.PrefabInfo", @@ -222,8 +222,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 40, - "height": 40 + "width": 120, + "height": 80 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -255,7 +255,7 @@ "fileId": "8ahZv91itPcYJm8S0veHYl" }, { - "__type__": "cc.Animation", + "__type__": "cc.RigidBody2D", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -266,73 +266,10 @@ "__prefab": { "__id__": 13 }, - "playOnLoad": true, - "_clips": [ - { - "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0cIZpMAklNUpGWSkPm4J6y" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "tag": 8, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": -0.7, - "y": 0.3 - }, - "_size": { - "__type__": "cc.Size", - "width": 29.3, - "height": 26 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "9cuqRvcClMR6+Rk3i1QazN" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, "enabledContactListener": true, "bullet": false, "awakeOnLoad": true, - "_group": 4, + "_group": 1, "_type": 1, "_allowSleep": false, "_gravityScale": 1, @@ -349,7 +286,75 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ebUK01+IlEDoXAWY28kiBV" + "fileId": "59HK6AcrdOhbxkRsbxWQ3l" + }, + { + "__type__": "cc.BoxCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "tag": 0, + "_group": 4, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": -0.1, + "y": 0.5 + }, + "_size": { + "__type__": "cc.Size", + "width": 25.4, + "height": 23.3 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e4gDUfAyNDN6GrEPB169Le" + }, + { + "__type__": "f680dkagx9PmbfqtF463/Ua", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "speed": 600, + "controlPointSide": 1, + "controlPointOffset": 0.7, + "controlPointRandomness": 0.1, + "autoRotate": true, + "showTrajectory": false, + "trajectoryColor": { + "__type__": "cc.Color", + "r": 0, + "g": 255, + "b": 0, + "a": 255 + }, + "trajectoryWidth": 3, + "easing": "linear", + "rotationSmoothness": 0.6, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e2YMe3B/1NxaropG7G9Ijp" }, { "__type__": "cc.PrefabInfo", diff --git a/assets/resources/game/skills/ball_red.prefab.meta b/assets/resources/game/skills/greenball.prefab.meta similarity index 62% rename from assets/resources/game/skills/ball_red.prefab.meta rename to assets/resources/game/skills/greenball.prefab.meta index 1c2b88ae..e0416ba4 100644 --- a/assets/resources/game/skills/ball_red.prefab.meta +++ b/assets/resources/game/skills/greenball.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "a21ef1a0-a1e9-43cf-a762-91631dbd96da", + "uuid": "ae55ef52-0f0b-4d06-8654-44f7e99dda8c", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "ball_red" + "syncNodeName": "greenball" } } diff --git a/assets/script/game/common/config/BoxSet.ts b/assets/script/game/common/config/BoxSet.ts index a2b40744..4f7ad946 100644 --- a/assets/script/game/common/config/BoxSet.ts +++ b/assets/script/game/common/config/BoxSet.ts @@ -36,7 +36,8 @@ export enum BoxSet { MOVE_RANGE_X = 20, MAX_SKILL_SY = 50, MAX_SKILL_BY = 80, - ATK_Y = 20, + ATK_Y = 40, + ATK_X = 10, } export enum GameSet { ATK_TO_ATK_RATIO=0.1, diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index 01252c4f..0054ba98 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -98,37 +98,37 @@ info:技能描述 */ export const HeroSkillList = [6001,6002,6003,6004,6005] export const SkillSet = { - 6001:{uuid:6001,name:"凛冬之触",sp_name:"ball_blue",path:"6001",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:0,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人释放寒冰弹,造成100%攻击的伤害"}, - 6002:{uuid:6002,name:"烈焰之怒",sp_name:"ball_red",path:"6002",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:0,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人释放火焰弹,造成100%攻击的伤害"}, - 6003:{uuid:6003,name:"奥术冲击",sp_name:"ball_green",path:"6003",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:0,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人释放魔法弹,造成100%攻击的伤害"}, - 6004:{uuid:6004,name:"神圣裁决",sp_name:"ball_yellow",path:"6004",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:0,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人释放圣光弹,造成100%攻击的伤害"}, - 6005:{uuid:6005,name:"破空斩击",sp_name:"patk",path:"6005",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:0,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:50,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"攻击前方直线100码内的敌人造成50%伤害"}, - 6006:{uuid:6006,name:"穿心箭矢",sp_name:"arrow",path:"6006",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:0,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人释放箭矢,造成100%攻击的伤害"}, - 6007:{uuid:6007,name:"铁斧打击",sp_name:"mon_ft",path:"6007",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:0,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人扔出铁斧,造成100%攻击的伤害"}, - 6008:{uuid:6008,name:"木棍打击",sp_name:"mon_ly",path:"6008",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:0,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人扔出木棍,造成100%攻击的伤害"}, - 6009:{uuid:6009,name:"飞刀打击",sp_name:"mon_xd",path:"6009",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:0,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人扔出飞刀,造成100%攻击的伤害"}, - 6010:{uuid:6010,name:"石斧打击",sp_name:"mon_sf",path:"6010",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:0,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人扔出石斧,造成100%攻击的伤害"}, - 6011:{uuid:6011,name:"烈火呼吸",sp_name:"firequan",path:"6011",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:0,endType:1,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:3,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:0.5,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"召唤烈焰攻击前方敌人,造成200%攻击的伤害,烈焰维持3秒"}, - 6012:{uuid:6012,name:"大火球" ,sp_name:"fire",path:"6012",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:0,endType:1,fname:"max",flash:false,with:50,debuff:2,depb:20,debtime:2,derate:100,in:1,count:1,def:0,apup:0,ap:300,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"召唤大火球攻击前方所有敌人,造成300%攻击的伤害,有一定几率施加灼烧"}, + 6001:{uuid:6001,name:"凛冬之触",sp_name:"greenball",path:"6001",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:AnimType.parabolic,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人释放寒冰弹,造成100%攻击的伤害"}, + 6002:{uuid:6002,name:"烈焰之怒",sp_name:"greenball",path:"6002",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:AnimType.parabolic,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人释放火焰弹,造成100%攻击的伤害"}, + 6003:{uuid:6003,name:"奥术冲击",sp_name:"greenball",path:"6003",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:AnimType.parabolic,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人释放魔法弹,造成100%攻击的伤害"}, + 6004:{uuid:6004,name:"神圣裁决",sp_name:"greenball",path:"6004",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:AnimType.parabolic,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人释放圣光弹,造成100%攻击的伤害"}, + 6005:{uuid:6005,name:"破空斩击",sp_name:"patk",path:"6005",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:AnimType.parabolic,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:50,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"攻击前方直线100码内的敌人造成50%伤害"}, + 6006:{uuid:6006,name:"穿心箭矢",sp_name:"arrow",path:"6006",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:AnimType.parabolic,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人释放箭矢,造成100%攻击的伤害"}, + 6007:{uuid:6007,name:"铁斧打击",sp_name:"mon_ft",path:"6007",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:AnimType.parabolic,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人扔出铁斧,造成100%攻击的伤害"}, + 6008:{uuid:6008,name:"木棍打击",sp_name:"mon_ly",path:"6008",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:AnimType.parabolic,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人扔出木棍,造成100%攻击的伤害"}, + 6009:{uuid:6009,name:"飞刀打击",sp_name:"mon_xd",path:"6009",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:AnimType.parabolic,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人扔出飞刀,造成100%攻击的伤害"}, + 6010:{uuid:6010,name:"石斧打击",sp_name:"mon_sf",path:"6010",TargetType:1,TargetGroup:3,act:"atk",CdType:1,AnimType:AnimType.parabolic,endType:3,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"向最前方敌人扔出石斧,造成100%攻击的伤害"}, + 6011:{uuid:6011,name:"烈火呼吸",sp_name:"firequan",path:"6011",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:3,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:0.5,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"召唤烈焰攻击前方敌人,造成200%攻击的伤害,烈焰维持3秒"}, + 6012:{uuid:6012,name:"大火球" ,sp_name:"fire",path:"6012",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max",flash:false,with:50,debuff:2,depb:20,debtime:2,derate:100,in:1,count:1,def:0,apup:0,ap:300,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"召唤大火球攻击前方所有敌人,造成300%攻击的伤害,有一定几率施加灼烧"}, 6013:{uuid:6013,name:"火墙", sp_name:"firewall",path:"6013",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:4,endType:1,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:10,count:1,def:0,apup:0,ap:50,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"在最前方敌人位置,召唤一堵火墙,持续10秒,每秒造成50%攻击伤害"}, - 6014:{uuid:6014,name:"寒冰箭", sp_name:"arrow_blue",path:"6014",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:0,endType:1,fname:"max",flash:false,with:50,debuff:1,depb:20,debtime:2,derate:0,in:1,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,20%几率冰冻敌人"}, - 6015:{uuid:6015,name:"烈焰射击",sp_name:"arrow_yellow",path:"6015",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:0,endType:1,fname:"max",flash:false,with:50,debuff:3,depb:20,debtime:2,derate:0,in:1,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,20%几率眩晕敌人"}, - 6016:{uuid:6016,name:"龙卷风", sp_name:"bwind",path:"6016",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:0,endType:1,fname:"max",flash:false,with:50,debuff:8,depb:50,debtime:1,derate:0,in:1,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,50%几率击退敌人"}, - 6017:{uuid:6017,name:"生命之泉",sp_name:"heath",path:"6017",TargetType:1,TargetGroup:2,act:"max",CdType:2,AnimType:0,endType:1,fname:"max_blue",flash:true,with:50,debuff:0,depb:0,debtime:0,derate:0,in:5,count:1,def:0,apup:0,ap:100,mhp:0,hp:3,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"5秒持续为全体友方恢复施法者最大生命值15%的生命"}, - 6018:{uuid:6018,name:"神圣护盾",sp_name:"shield",path:"6018",TargetType:1,TargetGroup:0,act:"max",CdType:2,AnimType:0,endType:1,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:30,speed:720,sonsk:0,hero:0,info:"召唤圣盾保护自己,可以抵御3次攻击"}, - 6019:{uuid:6019,name:"战争咆哮",sp_name:"apup",path:"6019",TargetType:1,TargetGroup:2,act:"max",CdType:2,AnimType:0,endType:1,fname:"max_red",flash:true,with:50,debuff:0,depb:0,debtime:0,derate:0,in:1,count:1,def:0,apup:20,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"为全体友方增加施法者攻击力20%的攻击"}, + 6014:{uuid:6014,name:"寒冰箭", sp_name:"arrow_blue",path:"6014",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max",flash:false,with:50,debuff:1,depb:20,debtime:2,derate:0,in:1,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,20%几率冰冻敌人"}, + 6015:{uuid:6015,name:"烈焰射击",sp_name:"arrow_yellow",path:"6015",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max",flash:false,with:50,debuff:3,depb:20,debtime:2,derate:0,in:1,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,20%几率眩晕敌人"}, + 6016:{uuid:6016,name:"龙卷风", sp_name:"bwind",path:"6016",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max",flash:false,with:50,debuff:8,depb:50,debtime:1,derate:0,in:1,count:1,def:0,apup:0,ap:200,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,50%几率击退敌人"}, + 6017:{uuid:6017,name:"生命之泉",sp_name:"heath",path:"6017",TargetType:1,TargetGroup:2,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max_blue",flash:true,with:50,debuff:0,depb:0,debtime:0,derate:0,in:5,count:1,def:0,apup:0,ap:100,mhp:0,hp:3,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"5秒持续为全体友方恢复施法者最大生命值15%的生命"}, + 6018:{uuid:6018,name:"神圣护盾",sp_name:"shield",path:"6018",TargetType:1,TargetGroup:0,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:0.8,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:30,speed:720,sonsk:0,hero:0,info:"召唤圣盾保护自己,可以抵御3次攻击"}, + 6019:{uuid:6019,name:"战争咆哮",sp_name:"apup",path:"6019",TargetType:1,TargetGroup:2,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max_red",flash:true,with:50,debuff:0,depb:0,debtime:0,derate:0,in:1,count:1,def:0,apup:20,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"为全体友方增加施法者攻击力20%的攻击"}, 6021:{uuid:6021,name:"死亡射击",sp_name:"shoot2",path:"6021",TargetType:2,TargetGroup:3,act:"max",CdType:2,AnimType:4,endType:0,fname:"max_blue",flash:true,with:50,debuff:0,depb:0,debtime:0,derate:0,in:1,count:1,def:0,apup:0,ap:600,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"攻击最后方的敌人,造成600%攻击的伤害"}, - 6022:{uuid:6022,name:"寒霜之矛",sp_name:"icez",path:"6022",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:0,endType:1,fname:"max",flash:false,with:50,debuff:1,depb:50,debtime:2,derate:0,in:1,count:1,def:0,apup:0,ap:300,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"在最前方敌人位置,召唤冰刺攻击敌人,造成200%攻击的伤害,20%几率冰冻敌人"}, - 6023:{uuid:6023,name:"冰墙", sp_name:"icet",path:"6023",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:0,endType:1,fname:"max",flash:false,with:50,debuff:8,depb:50,debtime:1,derate:0,in:1,count:1,def:0,apup:0,ap:400,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"在最前方敌人位置,召唤冰墙攻击敌人,造成200%攻击的伤害,50%几率击退敌人"}, + 6022:{uuid:6022,name:"寒霜之矛",sp_name:"icez",path:"6022",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max",flash:false,with:50,debuff:1,depb:50,debtime:2,derate:0,in:1,count:1,def:0,apup:0,ap:300,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"在最前方敌人位置,召唤冰刺攻击敌人,造成200%攻击的伤害,20%几率冰冻敌人"}, + 6023:{uuid:6023,name:"冰墙", sp_name:"icet",path:"6023",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max",flash:false,with:50,debuff:8,depb:50,debtime:1,derate:0,in:1,count:1,def:0,apup:0,ap:400,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"在最前方敌人位置,召唤冰墙攻击敌人,造成200%攻击的伤害,50%几率击退敌人"}, 6024:{uuid:6024,name:"旋风斩", sp_name:"fwind",path:"6024",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:3,endType:1,fname:"max_red",flash:false,with:50,debuff:8,depb:50,debtime:1,derate:0,in:2,count:1,def:0,apup:0,ap:80,mhp:0,hp:0,cd:5,buff_cd:0.5,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"旋转武器对周围的敌人造成80%攻击,2秒内旋转4次"}, - 6025:{uuid:6025,name:"火焰漩涡",sp_name:"fireball",path:"6025",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:0,endType:1,fname:"max",flash:false,with:50,debuff:8,depb:50,debtime:1,derate:0,in:3,count:1,def:0,apup:0,ap:500,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"召唤一个能量球射向前方敌人,对遇到的第一个敌人造成500%攻击的伤害,并击退"}, - 6026:{uuid:6026,name:"潮汐", sp_name:"watert",path:"6026",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:0,endType:1,fname:"max",flash:false,with:50,debuff:8,depb:50,debtime:2,derate:0,in:3,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"在最前方敌人位置,召唤水柱攻击敌人,每秒造成100%攻击的伤害,50%几率击退敌人"}, + 6025:{uuid:6025,name:"火焰漩涡",sp_name:"fireball",path:"6025",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max",flash:false,with:50,debuff:8,depb:50,debtime:1,derate:0,in:3,count:1,def:0,apup:0,ap:500,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"召唤一个能量球射向前方敌人,对遇到的第一个敌人造成500%攻击的伤害,并击退"}, + 6026:{uuid:6026,name:"潮汐", sp_name:"watert",path:"6026",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max",flash:false,with:50,debuff:8,depb:50,debtime:2,derate:0,in:3,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"在最前方敌人位置,召唤水柱攻击敌人,每秒造成100%攻击的伤害,50%几率击退敌人"}, 6027:{uuid:6027,name:"国王霸气",sp_name:"kingba",path:"6027",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:3,endType:1,fname:"max",flash:false,with:50,debuff:8,depb:100,debtime:2,derate:0,in:3,count:1,def:0,apup:2,ap:400,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"释放霸气攻击周围敌人,造成400%伤害,并100%几率击退敌人"}, - 6028:{uuid:6028,name:"自然庇佑",sp_name:"heath2",path:"6028",TargetType:1,TargetGroup:2,act:"max",CdType:2,AnimType:0,endType:1,fname:"max_blue",flash:true,with:50,debuff:0,depb:0,debtime:0,derate:0,in:2,count:1,def:0,apup:0,ap:100,mhp:0,hp:10,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"为全体友方恢复施法者最大生命值10%的生命,和抵御1次攻击的护盾"}, + 6028:{uuid:6028,name:"自然庇佑",sp_name:"heath2",path:"6028",TargetType:1,TargetGroup:2,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max_blue",flash:true,with:50,debuff:0,depb:0,debtime:0,derate:0,in:2,count:1,def:0,apup:0,ap:100,mhp:0,hp:10,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"为全体友方恢复施法者最大生命值10%的生命,和抵御1次攻击的护盾"}, 6029:{uuid:6029,name:"陨石术", sp_name:"fireys",path:"6029",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:4,endType:1,fname:"max",flash:false,with:50,debuff:8,depb:50,debtime:2,derate:0,in:3,count:1,def:0,apup:0,ap:500,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"在最前方敌人位置,召唤陨石攻击敌人,造成500%攻击的伤害"}, - 6030:{uuid:6030,name:"闪电呼吸",sp_name:"dianquan",path:"6030",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:0,endType:1,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:3,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:0.5,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"召唤闪电攻击前方敌人,造成200%攻击的伤害,烈焰维持3秒"}, - 6031:{uuid:6031,name:"召唤仆从",sp_name:"zhaohuan",path:"6031",TargetType:1,TargetGroup:0,act:"max",CdType:2,AnimType:0,endType:1,fname:"max_blue",flash:true,with:50,debuff:0,depb:0,debtime:0,derate:0,in:2,count:1,def:20,apup:0,ap:70,mhp:0,hp:70,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:5211,info:"召唤一个与施法者等级相同的骷髅战士为我方而战"}, - 6032:{uuid:6032,name:"自愈", sp_name:"heath_small",path:"6032",TargetType:1,TargetGroup:0,act:"max",CdType:2,AnimType:0,endType:1,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:2,count:1,def:0,apup:0,ap:100,mhp:0,hp:5,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"主动:自己回复自身5%最大生命值的生命"}, - 6033:{uuid:6033,name:"震地裂击",sp_name:"cuida",path:"6033",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:0,endType:1,fname:"max",flash:false,with:50,debuff:4,depb:100,debtime:1,derate:20,in:1,count:1,def:0,apup:0,ap:500,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:6035,hero:0,info:"捶爆前方目标，造成300%攻击的伤害，震慑敌人，本局内全部敌方降低对方10%攻击力"}, - 6034:{uuid:6034,name:"风暴之矢",sp_name:"bingyu",path:"6034",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:0,endType:1,fname:"max",flash:false,with:50,debuff:4,depb:100,debtime:1,derate:20,in:1,count:1,def:0,apup:0,ap:80,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"射出能量暴风箭攻击最前方范围敌人,每波造成80%攻击的伤害"} + 6030:{uuid:6030,name:"闪电呼吸",sp_name:"dianquan",path:"6030",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:3,count:1,def:0,apup:0,ap:100,mhp:0,hp:0,cd:5,buff_cd:0.5,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"召唤闪电攻击前方敌人,造成200%攻击的伤害,烈焰维持3秒"}, + 6031:{uuid:6031,name:"召唤仆从",sp_name:"zhaohuan",path:"6031",TargetType:1,TargetGroup:0,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max_blue",flash:true,with:50,debuff:0,depb:0,debtime:0,derate:0,in:2,count:1,def:20,apup:0,ap:70,mhp:0,hp:70,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:5211,info:"召唤一个与施法者等级相同的骷髅战士为我方而战"}, + 6032:{uuid:6032,name:"自愈", sp_name:"heath_small",path:"6032",TargetType:1,TargetGroup:0,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max",flash:false,with:50,debuff:0,depb:0,debtime:0,derate:0,in:2,count:1,def:0,apup:0,ap:100,mhp:0,hp:5,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"主动:自己回复自身5%最大生命值的生命"}, + 6033:{uuid:6033,name:"震地裂击",sp_name:"cuida",path:"6033",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max",flash:false,with:50,debuff:4,depb:100,debtime:1,derate:20,in:1,count:1,def:0,apup:0,ap:500,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:6035,hero:0,info:"捶爆前方目标，造成300%攻击的伤害，震慑敌人，本局内全部敌方降低对方10%攻击力"}, + 6034:{uuid:6034,name:"风暴之矢",sp_name:"bingyu",path:"6034",TargetType:1,TargetGroup:3,act:"max",CdType:2,AnimType:AnimType.parabolic,endType:1,fname:"max",flash:false,with:50,debuff:4,depb:100,debtime:1,derate:20,in:1,count:1,def:0,apup:0,ap:80,mhp:0,hp:0,cd:5,buff_cd:1,hited:0.3,shield:0,speed:720,sonsk:0,hero:0,info:"射出能量暴风箭攻击最前方范围敌人,每波造成80%攻击的伤害"} }; \ No newline at end of file diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index ab35f810..f11541af 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -59,30 +59,30 @@ export const HeroInfo = { 5009:{uuid:5009,name:"暴风射手",path:"a5", lv:3,kind:2,type:1,hp:5,ap:15,ap_u:0,ap_ur:0,hp_up:0,dis:700,a_cd:1.2,speed:50,skills:[6006],tals:"说明"}, 5010:{uuid:5010,name:"苍穹射手",path:"a3", lv:3,kind:1,type:1,hp:5,ap:15,ap_u:0,ap_ur:0,hp_up:0,dis:700,a_cd:1.2,speed:50,skills:[6006],tals:"说明"}, 5011:{uuid:5011,name:"幽灵射手",path:"a4", lv:3,kind:2,type:1,hp:5,ap:15,ap_u:0,ap_ur:0,hp_up:0,dis:700,a_cd:1.2,speed:50,skills:[6006],tals:"说明"}, - 5201:{uuid:5201,name:"兽人战士",path:"mor1", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1,speed:50,skills:[6001],tals:"说明"}, - 5202:{uuid:5202,name:"兽人刺客",path:"mor2", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1,speed:50,skills:[6001],tals:"说明"}, - 5203:{uuid:5203,name:"兽人护卫",path:"mor3", lv:1,kind:1,type:1,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1.2,speed:50,skills:[6001],tals:"说明"}, - 5204:{uuid:5204,name:"石卫", path:"mgem1",lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1,speed:50,skills:[6001],tals:"说明"}, - 5205:{uuid:5205,name:"土卫", path:"mgem2",lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1,speed:50,skills:[6001],tals:"说明"}, - 5206:{uuid:5206,name:"树人", path:"mgem3",lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1,speed:50,skills:[6001],tals:"说明"}, - 5210:{uuid:5210,name:"骷髅战士",path:"mkl4", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1,speed:50,skills:[6001],tals:"说明"}, - 5211:{uuid:5211,name:"骷髅战士",path:"mkl5", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1,speed:50,skills:[6001],tals:"说明"}, - 5212:{uuid:5212,name:"骷髅战士",path:"mkl6", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1,speed:50,skills:[6001],tals:"说明"}, - 5213:{uuid:5213,name:"骷髅射手",path:"mkla1",lv:1,kind:1,type:1,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1.2,speed:50,skills:[6001],tals:"说明"}, - 5214:{uuid:5214,name:"骷髅射手",path:"mkla2",lv:1,kind:1,type:1,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1.2,speed:50,skills:[6001],tals:"说明"}, - 5215:{uuid:5215,name:"骷髅射手",path:"mkla3",lv:1,kind:1,type:1,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1.2,speed:50,skills:[6001],tals:"说明"}, - 5216:{uuid:5216,name:"元素1", path:"my1", lv:2,kind:1,type:2,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:200,a_cd:1.5,speed:50,skills:[6001],tals:"说明"}, - 5217:{uuid:5217,name:"元素2", path:"my2", lv:2,kind:1,type:2,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:200,a_cd:1.5,speed:50,skills:[6002],tals:"说明"}, - 5218:{uuid:5218,name:"元素3", path:"my3", lv:2,kind:1,type:2,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:200,a_cd:1.5,speed:50,skills:[6001],tals:"说明"}, - 5219:{uuid:5219,name:"牛头战士",path:"mn1", lv:2,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1,speed:50,skills:[6001],tals:"说明"}, - 5220:{uuid:5220,name:"牛头战士",path:"mn2", lv:1,kind:1,type:1,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1.2,speed:50,skills:[6001],tals:"说明"}, - 5221:{uuid:5221,name:"牛头战士",path:"mn3", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1,speed:50,skills:[6001],tals:"说明"}, - 5222:{uuid:5222,name:"独眼巨人",path:"md1", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1,speed:50,skills:[6001],tals:"说明"}, - 5223:{uuid:5223,name:"独眼巨人",path:"md2", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1,speed:50,skills:[6008],tals:"说明"}, - 5224:{uuid:5224,name:"独眼巨人",path:"md3", lv:1,kind:1,type:1,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:80,a_cd:1.2,speed:50,skills:[6001],tals:"说明"}, - 5225:{uuid:5225,name:"精英独眼",path:"md4", lv:3,kind:1,type:2,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:200,a_cd:1,speed:50,skills:[6001],tals:"说明"}, - 5226:{uuid:5226,name:"精英牛头",path:"mn4", lv:3,kind:1,type:2,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:200,a_cd:1,speed:50,skills:[6001],tals:"说明"}, - 5227:{uuid:5227,name:"精英兽人",path:"mor4", lv:3,kind:1,type:2,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:200,a_cd:1,speed:50,skills:[6001],tals:"说明"} + 5201:{uuid:5201,name:"兽人战士",path:"mor1", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"}, + 5202:{uuid:5202,name:"兽人刺客",path:"mor2", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"}, + 5203:{uuid:5203,name:"兽人护卫",path:"mor3", lv:1,kind:1,type:1,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1.2,speed:50,skills:[6001],tals:"说明"}, + 5204:{uuid:5204,name:"石卫", path:"mgem1",lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"}, + 5205:{uuid:5205,name:"土卫", path:"mgem2",lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"}, + 5206:{uuid:5206,name:"树人", path:"mgem3",lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"}, + 5210:{uuid:5210,name:"骷髅战士",path:"mkl4", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"}, + 5211:{uuid:5211,name:"骷髅战士",path:"mkl5", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"}, + 5212:{uuid:5212,name:"骷髅战士",path:"mkl6", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"}, + 5213:{uuid:5213,name:"骷髅射手",path:"mkla1",lv:1,kind:1,type:1,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1.2,speed:50,skills:[6001],tals:"说明"}, + 5214:{uuid:5214,name:"骷髅射手",path:"mkla2",lv:1,kind:1,type:1,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1.2,speed:50,skills:[6001],tals:"说明"}, + 5215:{uuid:5215,name:"骷髅射手",path:"mkla3",lv:1,kind:1,type:1,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1.2,speed:50,skills:[6001],tals:"说明"}, + 5216:{uuid:5216,name:"元素1", path:"my1", lv:2,kind:1,type:2,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1.5,speed:50,skills:[6001],tals:"说明"}, + 5217:{uuid:5217,name:"元素2", path:"my2", lv:2,kind:1,type:2,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1.5,speed:50,skills:[6001],tals:"说明"}, + 5218:{uuid:5218,name:"元素3", path:"my3", lv:2,kind:1,type:2,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1.5,speed:50,skills:[6001],tals:"说明"}, + 5219:{uuid:5219,name:"牛头战士",path:"mn1", lv:2,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"}, + 5220:{uuid:5220,name:"牛头战士",path:"mn2", lv:1,kind:1,type:1,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1.2,speed:50,skills:[6001],tals:"说明"}, + 5221:{uuid:5221,name:"牛头战士",path:"mn3", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"}, + 5222:{uuid:5222,name:"独眼巨人",path:"md1", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"}, + 5223:{uuid:5223,name:"独眼巨人",path:"md2", lv:1,kind:1,type:0,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"}, + 5224:{uuid:5224,name:"独眼巨人",path:"md3", lv:1,kind:1,type:1,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1.2,speed:50,skills:[6001],tals:"说明"}, + 5225:{uuid:5225,name:"精英独眼",path:"md4", lv:3,kind:1,type:2,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"}, + 5226:{uuid:5226,name:"精英牛头",path:"mn4", lv:3,kind:1,type:2,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"}, + 5227:{uuid:5227,name:"精英兽人",path:"mor4", lv:3,kind:1,type:2,hp:200,ap:1,ap_u:0,ap_ur:0,hp_up:0,dis:400,a_cd:1,speed:50,skills:[6001],tals:"说明"} }; export const HeroUpInfo = { 5001:{ap_up:0,ap_up_rate:10,self_ap_up:0,self_ap_up_rate:0,hp_up:0,self_hp_up:0}, diff --git a/assets/script/game/hero/SkillConComp.ts b/assets/script/game/hero/SkillConComp.ts index 967867ac..4bff0677 100644 --- a/assets/script/game/hero/SkillConComp.ts +++ b/assets/script/game/hero/SkillConComp.ts @@ -80,14 +80,17 @@ export class SkillConComp extends CCComp { const skillEntity = ecs.getEntity(Skill); const targets = this.selectEnemyTargets(config); if (targets.length === 0) return; - skillEntity.load( - new Vec3(this.HeroView.node.position.x, this.HeroView.node.position.y+BoxSet.ATK_Y, 0), // 起始位置 - this.HeroView.box_group, // 阵营 - this.node.parent, // 父节点 - config.uuid, // 技能ID - new Vec3(targets[0]?.get(HeroViewComp).node.position.x, targets[0]?.get(HeroViewComp).node.position.y, 0), // 目标位置 - this.HeroView - ); + this.scheduleOnce(()=>{ + if(targets.length<=0||!this.HeroView) return + skillEntity.load( + new Vec3(this.HeroView.node.position.x+BoxSet.ATK_X*this.HeroView.scale, this.HeroView.node.position.y+BoxSet.ATK_Y, 0), // 起始位置 + this.HeroView.box_group, // 阵营 + this.node.parent, // 父节点 + config.uuid, // 技能ID + new Vec3(targets[0]?.get(HeroViewComp).node.position.x, targets[0]?.get(HeroViewComp).node.position.y, 0), // 目标位置 + this.HeroView + ); + },0.3) // console.log("技能:"+config.uuid+"=>"+targets[0]?.get(HeroViewComp).hero_name); } diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts index 2ffeeaa1..56b97a83 100644 --- a/assets/script/game/skills/SkillCom.ts +++ b/assets/script/game/skills/SkillCom.ts @@ -18,7 +18,6 @@ const { ccclass, property } = _decorator; @ccclass('SkillCom') @ecs.register('SkillCom') export class SkillCom extends CCComp { - BezierMove:BezierMove=null!; s_uuid:number = 0; s_name:string = ""; hero:number = 0; @@ -50,7 +49,7 @@ export class SkillCom extends CCComp { } start() { - this.BezierMove=this.node.getComponent(BezierMove) + oops.message.on(GameEvent.MissionEnd, this.doDestroy, this); this.node.active = true; let collider = this.getComponent(Collider2D); @@ -59,44 +58,52 @@ export class SkillCom extends CCComp { if (collider) { collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this); } - let dir_x = this.targetPos.x > this.node.position.x ? 1 : -1 - this.node.scale = v3(dir_x,1,1) + + if(SkillSet[this.s_uuid].AnimType==AnimType.parabolic){ + let bm=this.node.getComponent(BezierMove) + // bm.speed=700 + if(this.group==BoxSet.MONSTER) bm.controlPointSide=-1 + bm.moveTo(this.targetPos) + } + + // let dir_x = this.targetPos.x > this.node.position.x ? 1 : -1 + // this.node.scale = v3(dir_x,1,1) // 根据目标位置设置节点朝向 - if ( this.targetPos) { - // 计算朝向 - let direction = this.targetPos.x > this.node.position.x ? 1 : -1; - // 设置节点缩放来改变朝向 - this.node.scale = v3(direction * Math.abs(this.scale), this.scale, 1); - } - let dir_y = ( this.targetPos.y+BoxSet.ATK_Y) > this.node.position.y ? 1 : -1 - if( this.targetPos.y+BoxSet.ATK_Y==this.node.position.y){ - dir_y=0 - } - // 计算这一帧的移动距离 - this.distance_x = SkillSet[this.s_uuid].speed*dir_x; - this.distance_y = this.distance_x*Math.abs(this.targetPos.y-this.node.position.y)/Math.abs(this.targetPos.x-this.node.position.x)*dir_y; - this.startMovement(); + // if ( this.targetPos) { + // // 计算朝向 + // let direction = this.targetPos.x > this.node.position.x ? 1 : -1; + // // 设置节点缩放来改变朝向 + // this.node.scale = v3(direction * Math.abs(this.scale), this.scale, 1); + // } + // let dir_y = ( this.targetPos.y+BoxSet.ATK_Y) > this.node.position.y ? 1 : -1 + // if( this.targetPos.y+BoxSet.ATK_Y==this.node.position.y){ + // dir_y=0 + // } + // // 计算这一帧的移动距离 + // this.distance_x = SkillSet[this.s_uuid].speed*dir_x; + // this.distance_y = this.distance_x*Math.abs(this.targetPos.y-this.node.position.y)/Math.abs(this.targetPos.x-this.node.position.x)*dir_y; + // this.startMovement(); - // 计算目标角度 - if (this.targetPos) { - const currentPos = this.node.position; + // // 计算目标角度 + // if (this.targetPos) { + // const currentPos = this.node.position; - // 计算角度（弧度） - const dx = this.targetPos.x - currentPos.x; - const dy = (this.targetPos.y + BoxSet.ATK_Y) - currentPos.y; - const angle = Math.atan2(dy, dx); + // // 计算角度（弧度） + // const dx = this.targetPos.x - currentPos.x; + // const dy = (this.targetPos.y + BoxSet.ATK_Y) - currentPos.y; + // const angle = Math.atan2(dy, dx); - // 将弧度转换为角度并设置节点旋转 - this.angle = angle * 180 / Math.PI; - this.node.angle = this.angle; // 移除负号，修正角度方向 - } + // // 将弧度转换为角度并设置节点旋转 + // this.angle = angle * 180 / Math.PI; + // this.node.angle = this.angle; // 移除负号，修正角度方向 + // } - // 计算速度分量 - const radians = this.angle * Math.PI / 180; // 移除负号，使用正确的角度 - this.distance_x = this.speed * Math.cos(radians); - this.distance_y = this.speed * Math.sin(radians); + // // 计算速度分量 + // const radians = this.angle * Math.PI / 180; // 移除负号，使用正确的角度 + // this.distance_x = this.speed * Math.cos(radians); + // this.distance_y = this.speed * Math.sin(radians); - this.startMovement(); + // this.startMovement(); // console.log("skill start",this.node.parent) } onBeginContact (seCol: Collider2D, oCol: Collider2D) { @@ -114,7 +121,7 @@ export class SkillCom extends CCComp { private startMovement() { - switch(this.animType) { + switch(SkillSet[this.s_uuid].AnimType) { case AnimType.parabolic: this.startBezierMove(); break; @@ -146,18 +153,18 @@ export class SkillCom extends CCComp { } private startBezierMove() { - if (!this.targetPos) return; - let s_pos = v3(this.startPos.x,this.startPos.y) - let c_pos = v3((this.targetPos.x+this.startPos.x)/2,this.startPos.y+150) - let e_pos = v3(this.targetPos.x,this.targetPos.y) - let time =Math.abs(Math.abs(this.targetPos.x-this.startPos.x)/this.speed) + + // let s_pos = v3(this.startPos.x,this.startPos.y) + // let c_pos = v3((this.targetPos.x+this.startPos.x)/2,this.startPos.y+150) + // let e_pos = v3(this.targetPos.x,this.targetPos.y) + // let time =Math.abs(Math.abs(this.targetPos.x-this.startPos.x)/this.speed) - // console.log("开始贝塞尔运动=>time:"+time,"s_pos:"+s_pos,"c_pos:"+c_pos,"e_pos:"+e_pos) - SkillCom.bezierTo(this.node,time,s_pos,c_pos,e_pos,{ - onComplete: (target?: object) => { - this.is_destroy=true - }, - }).start(); + // // console.log("开始贝塞尔运动=>time:"+time,"s_pos:"+s_pos,"c_pos:"+c_pos,"e_pos:"+e_pos) + // SkillCom.bezierTo(this.node,time,s_pos,c_pos,e_pos,{ + // onComplete: (target?: object) => { + // this.is_destroy=true + // }, + // }).start(); } private startFixedMove() { @@ -233,7 +240,7 @@ export class SkillCom extends CCComp { update(deltaTime: number) { if(smc.mission.pause) return; this.toDestroy(); - this.startLinearMove(deltaTime); + if(this.animType==AnimType.linear) this.startLinearMove(deltaTime); } toDestroy() {