diff --git a/assets/resources/game/skills/anm/atk1.anim b/assets/resources/game/skills/anm/atk1.anim new file mode 100644 index 00000000..a676a2a4 --- /dev/null +++ b/assets/resources/game/skills/anm/atk1.anim @@ -0,0 +1,295 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "atk1", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 18, + "speed": 1, + "wrapMode": 1, + "enableTrsBlending": false, + "_duration": 0.9444444444444444, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + }, + { + "__id__": 11 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 17 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.VectorTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channels": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 9 + } + ], + "_nComponents": 3 + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + "position" + ] + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 4 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.16666666666666666 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 6 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.16666666666666666 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 8 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.16666666666666666 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 10 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 12 + }, + "proxy": null + }, + "_channel": { + "__id__": 15 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 13 + }, + { + "__id__": 14 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "SlashFX3" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 16 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.1111111111111111, + 0.2222222222222222, + 0.3333333333333333, + 0.4444444444444444, + 0.5555555555555556, + 0.6666666666666666, + 0.7777777777777778, + 0.8888888888888888 + ], + "_values": [ + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@abfb5", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@76684", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@b1a7d", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@0cbf1", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@500e6", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@33fff", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@4b91b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@7ab97", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@afacf", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/anm/atk1.anim.meta b/assets/resources/game/skills/anm/atk1.anim.meta new file mode 100644 index 00000000..b48a57b7 --- /dev/null +++ b/assets/resources/game/skills/anm/atk1.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "7e14a335-71d0-480e-beaf-e4d0ea6ecb19", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk1" + } +} diff --git a/assets/resources/game/skills/anm/atk2.anim b/assets/resources/game/skills/anm/atk2.anim new file mode 100644 index 00000000..0a99584c --- /dev/null +++ b/assets/resources/game/skills/anm/atk2.anim @@ -0,0 +1,155 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "light", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 18, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.8333333333333334, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 7 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channel": { + "__id__": 5 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 3 + }, + { + "__id__": 4 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "Node" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 6 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.05555555555555555, + 0.1111111111111111, + 0.16666666666666666, + 0.2222222222222222, + 0.2777777777777778, + 0.3333333333333333, + 0.3888888888888889, + 0.4444444444444444, + 0.5, + 0.5555555555555556, + 0.6111111111111112, + 0.6666666666666666, + 0.7222222222222222, + 0.7777777777777778 + ], + "_values": [ + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@813c5", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@821e0", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@33a20", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@1f6a0", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@0d15e", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@585d7", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@e54e2", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@06857", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@bf8fe", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@53534", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@1b0bb", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@8d306", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@b44d9", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@8364b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@b1f2c", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/anm/atk2.anim.meta b/assets/resources/game/skills/anm/atk2.anim.meta new file mode 100644 index 00000000..d3a75116 --- /dev/null +++ b/assets/resources/game/skills/anm/atk2.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "37647271-97cd-475c-a0b9-0f0603dde7ae", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk2" + } +} diff --git a/assets/resources/game/skills/anm/atk3.anim b/assets/resources/game/skills/anm/atk3.anim new file mode 100644 index 00000000..0a99584c --- /dev/null +++ b/assets/resources/game/skills/anm/atk3.anim @@ -0,0 +1,155 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "light", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 18, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.8333333333333334, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 7 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channel": { + "__id__": 5 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 3 + }, + { + "__id__": 4 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "Node" + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 6 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.05555555555555555, + 0.1111111111111111, + 0.16666666666666666, + 0.2222222222222222, + 0.2777777777777778, + 0.3333333333333333, + 0.3888888888888889, + 0.4444444444444444, + 0.5, + 0.5555555555555556, + 0.6111111111111112, + 0.6666666666666666, + 0.7222222222222222, + 0.7777777777777778 + ], + "_values": [ + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@813c5", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@821e0", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@33a20", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@1f6a0", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@0d15e", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@585d7", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@e54e2", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@06857", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@bf8fe", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@53534", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@1b0bb", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@8d306", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@b44d9", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@8364b", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@b1f2c", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/anm/atk3.anim.meta b/assets/resources/game/skills/anm/atk3.anim.meta new file mode 100644 index 00000000..86572fd7 --- /dev/null +++ b/assets/resources/game/skills/anm/atk3.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "d5db66e1-ef21-4e64-974a-94d2b586f0fa", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk3" + } +} diff --git a/assets/resources/game/skills/atk1.prefab b/assets/resources/game/skills/atk1.prefab new file mode 100644 index 00000000..8c8aa8c4 --- /dev/null +++ b/assets/resources/game/skills/atk1.prefab @@ -0,0 +1,366 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "atk1", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "atk1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 8 + }, + { + "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + } + ], + "_prefab": { + "__id__": 18 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 1000, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Node", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + } + ], + "_prefab": { + "__id__": 7 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 87, + "height": 97 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "93pNmvtQlLSqtTgIepyEmA" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "46594657-02d0-432c-bbad-dcbcad549216@aa3e6", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "12eKc8gltBz50frJCS5+ww" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "3arqAMBz1MvoXBzeDaL5M/", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 240, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_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.BoxCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "tag": 8, + "_group": 4, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_size": { + "__type__": "cc.Size", + "width": 160, + "height": 80 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "67e8EBnHtEYpqOYZg/o32p" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "enabledContactListener": true, + "bullet": false, + "awakeOnLoad": true, + "_group": 1, + "_type": 3, + "_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": "45wXoGyItFap/+Z91oLFpX" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "7e14a335-71d0-480e-beaf-e4d0ea6ecb19", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "7e14a335-71d0-480e-beaf-e4d0ea6ecb19", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c2RDvksalG2acL3tyGCY0t" + }, + { + "__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/atk1.prefab.meta b/assets/resources/game/skills/atk1.prefab.meta new file mode 100644 index 00000000..a42a350b --- /dev/null +++ b/assets/resources/game/skills/atk1.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "c996ebe8-8e1f-4f96-ae57-afa6772ff2fc", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "atk1" + } +} diff --git a/assets/resources/game/skills/base6.prefab b/assets/resources/game/skills/base6.prefab new file mode 100644 index 00000000..a5e16a8c --- /dev/null +++ b/assets/resources/game/skills/base6.prefab @@ -0,0 +1,403 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "base6", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "base6", + "_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": 0.9, + "y": 0.9, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "SlashFX3", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + } + ], + "_prefab": { + "__id__": 7 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 45.889, + "y": 40, + "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": 87, + "height": 97 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6478ffM1ZOYrFlvcvwtMHD" + }, + { + "__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__": "46594657-02d0-432c-bbad-dcbcad549216@29211", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a16rQ6fSVGTKOR1fkzJ3Uu" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "baafZffQBCfJGufCL/UdN6", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 80 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.49664333316829656, + "y": 0 + }, + "_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.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "enabledContactListener": true, + "bullet": false, + "awakeOnLoad": true, + "_group": 1, + "_type": 1, + "_allowSleep": false, + "_gravityScale": 1, + "_linearDamping": 0, + "_angularDamping": 0, + "_linearVelocity": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_angularVelocity": 0, + "_fixedRotation": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "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, + "y": 40 + }, + "_size": { + "__type__": "cc.Size", + "width": 180, + "height": 80 + }, + "_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, + "controlPointRandomness": 0, + "autoRotate": true, + "showTrajectory": false, + "trajectoryColor": { + "__type__": "cc.Color", + "r": 0, + "g": 255, + "b": 0, + "a": 255 + }, + "trajectoryWidth": 3, + "easing": "linear", + "rotationSmoothness": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e2YMe3B/1NxaropG7G9Ijp" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "7e14a335-71d0-480e-beaf-e4d0ea6ecb19", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "7e14a335-71d0-480e-beaf-e4d0ea6ecb19", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b2FPQXFCNH7alJWxanESql" + }, + { + "__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/base6.prefab.meta b/assets/resources/game/skills/base6.prefab.meta new file mode 100644 index 00000000..85889f16 --- /dev/null +++ b/assets/resources/game/skills/base6.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "4fb17422-fd00-4023-90f8-71f80224fa80", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "base6" + } +} diff --git a/assets/resources/game/skills/skill4.plist.meta b/assets/resources/game/skills/skill4.plist.meta index 560a0b82..a837f1eb 100644 --- a/assets/resources/game/skills/skill4.plist.meta +++ b/assets/resources/game/skills/skill4.plist.meta @@ -16,11 +16,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 3, "offsetY": -2, - "trimX": 1529, - "trimY": 44, + "trimX": 89, + "trimY": 766, "width": 83, "height": 44, "rawWidth": 95, @@ -53,6 +53,52 @@ ], "subMetas": {} }, + "29211": { + "importer": "sprite-frame", + "uuid": "46594657-02d0-432c-bbad-dcbcad549216@29211", + "displayName": "", + "id": "29211", + "name": "SlashFX3", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 90, + "width": 87, + "height": 97, + "rawWidth": 99, + "rawHeight": 99, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "ad487883-575b-4cdf-a4b8-ecd284aa53cb@6c48a", + "atlasUuid": "46594657-02d0-432c-bbad-dcbcad549216" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "30608": { "importer": "sprite-frame", "uuid": "46594657-02d0-432c-bbad-dcbcad549216@30608", @@ -62,11 +108,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -35, "offsetY": 13, - "trimX": 2019, - "trimY": 81, + "trimX": 236, + "trimY": 1087, "width": 9, "height": 14, "rawWidth": 95, @@ -111,8 +157,8 @@ "rotated": true, "offsetX": 3, "offsetY": 1, - "trimX": 260, - "trimY": 1, + "trimX": 97, + "trimY": 185, "width": 73, "height": 94, "rawWidth": 95, @@ -157,8 +203,8 @@ "rotated": true, "offsetX": -30, "offsetY": -15, - "trimX": 1700, - "trimY": 96, + "trimX": 166, + "trimY": 1048, "width": 31, "height": 42, "rawWidth": 95, @@ -200,11 +246,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -38, "offsetY": 17, - "trimX": 1950, - "trimY": 43, + "trimX": 240, + "trimY": 859, "width": 15, "height": 10, "rawWidth": 95, @@ -246,11 +292,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 17, "offsetY": 4, - "trimX": 1352, - "trimY": 1, + "trimX": 1, + "trimY": 456, "width": 57, "height": 88, "rawWidth": 95, @@ -292,11 +338,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": -3, - "trimX": 1575, - "trimY": 44, + "trimX": 1, + "trimY": 768, "width": 83, "height": 40, "rawWidth": 95, @@ -341,8 +387,8 @@ "rotated": false, "offsetX": -36, "offsetY": 14, - "trimX": 2019, - "trimY": 63, + "trimX": 1, + "trimY": 1010, "width": 9, "height": 16, "rawWidth": 95, @@ -387,8 +433,8 @@ "rotated": false, "offsetX": 19, "offsetY": -40, - "trimX": 800, - "trimY": 113, + "trimX": 79, + "trimY": 1074, "width": 13, "height": 14, "rawWidth": 95, @@ -433,8 +479,8 @@ "rotated": false, "offsetX": 16, "offsetY": 1, - "trimX": 384, - "trimY": 76, + "trimX": 155, + "trimY": 942, "width": 63, "height": 40, "rawWidth": 95, @@ -467,6 +513,52 @@ ], "subMetas": {} }, + "91931": { + "importer": "sprite-frame", + "uuid": "46594657-02d0-432c-bbad-dcbcad549216@91931", + "displayName": "", + "id": "91931", + "name": "SlashFX2", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 100, + "trimY": 1, + "width": 87, + "height": 97, + "rawWidth": 99, + "rawHeight": 99, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "ad487883-575b-4cdf-a4b8-ecd284aa53cb@6c48a", + "atlasUuid": "46594657-02d0-432c-bbad-dcbcad549216" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "97355": { "importer": "sprite-frame", "uuid": "46594657-02d0-432c-bbad-dcbcad549216@97355", @@ -476,11 +568,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 14, "offsetY": 1, - "trimX": 1055, - "trimY": 1, + "trimX": 1, + "trimY": 636, "width": 67, "height": 86, "rawWidth": 95, @@ -522,11 +614,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -28, "offsetY": 2, - "trimX": 1240, - "trimY": 114, + "trimX": 53, + "trimY": 1033, "width": 13, "height": 18, "rawWidth": 95, @@ -571,8 +663,8 @@ "rotated": true, "offsetX": 17, "offsetY": 5, - "trimX": 1264, - "trimY": 66, + "trimX": 1, + "trimY": 705, "width": 61, "height": 86, "rawWidth": 95, @@ -614,11 +706,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -28, "offsetY": 3, - "trimX": 1778, - "trimY": 114, + "trimX": 79, + "trimY": 1054, "width": 13, "height": 18, "rawWidth": 95, @@ -660,11 +752,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -27, "offsetY": 6, - "trimX": 1240, - "trimY": 97, + "trimX": 240, + "trimY": 817, "width": 15, "height": 22, "rawWidth": 95, @@ -709,8 +801,8 @@ "rotated": true, "offsetX": -20, "offsetY": -13, - "trimX": 1962, - "trimY": 1, + "trimX": 155, + "trimY": 909, "width": 31, "height": 66, "rawWidth": 95, @@ -755,8 +847,8 @@ "rotated": true, "offsetX": 6, "offsetY": -4, - "trimX": 356, - "trimY": 1, + "trimX": 92, + "trimY": 442, "width": 73, "height": 88, "rawWidth": 95, @@ -801,8 +893,8 @@ "rotated": true, "offsetX": 12, "offsetY": -2, - "trimX": 892, - "trimY": 1, + "trimX": 95, + "trimY": 260, "width": 63, "height": 92, "rawWidth": 95, @@ -844,11 +936,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 13, "offsetY": 0, - "trimX": 892, - "trimY": 66, + "trimX": 193, + "trimY": 241, "width": 61, "height": 92, "rawWidth": 95, @@ -893,8 +985,8 @@ "rotated": false, "offsetX": 16, "offsetY": 5, - "trimX": 1411, - "trimY": 1, + "trimX": 196, + "trimY": 153, "width": 59, "height": 86, "rawWidth": 95, @@ -939,8 +1031,8 @@ "rotated": false, "offsetX": -6, "offsetY": -5, - "trimX": 1617, - "trimY": 101, + "trimX": 174, + "trimY": 789, "width": 81, "height": 26, "rawWidth": 95, @@ -982,11 +1074,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -24, "offsetY": -2, - "trimX": 779, - "trimY": 78, + "trimX": 144, + "trimY": 1062, "width": 43, "height": 18, "rawWidth": 95, @@ -1028,11 +1120,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -36, "offsetY": 13, - "trimX": 384, - "trimY": 118, + "trimX": 155, + "trimY": 1048, "width": 9, "height": 12, "rawWidth": 95, @@ -1077,8 +1169,8 @@ "rotated": true, "offsetX": -21, "offsetY": 16, - "trimX": 1694, - "trimY": 45, + "trimX": 240, + "trimY": 871, "width": 43, "height": 14, "rawWidth": 95, @@ -1123,8 +1215,8 @@ "rotated": false, "offsetX": 1, "offsetY": 11, - "trimX": 532, - "trimY": 75, + "trimX": 1, + "trimY": 838, "width": 79, "height": 26, "rawWidth": 95, @@ -1169,8 +1261,8 @@ "rotated": false, "offsetX": 11, "offsetY": 1, - "trimX": 317, - "trimY": 76, + "trimX": 69, + "trimY": 926, "width": 65, "height": 46, "rawWidth": 95, @@ -1215,8 +1307,8 @@ "rotated": false, "offsetX": -4, "offsetY": 1, - "trimX": 1802, - "trimY": 1, + "trimX": 84, + "trimY": 812, "width": 79, "height": 42, "rawWidth": 95, @@ -1258,11 +1350,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -38, "offsetY": 13, - "trimX": 298, - "trimY": 76, + "trimX": 141, + "trimY": 921, "width": 17, "height": 12, "rawWidth": 95, @@ -1307,8 +1399,8 @@ "rotated": false, "offsetX": -12, "offsetY": -4, - "trimX": 177, - "trimY": 95, + "trimX": 82, + "trimY": 856, "width": 71, "height": 32, "rawWidth": 95, @@ -1353,8 +1445,8 @@ "rotated": false, "offsetX": -14, "offsetY": -2, - "trimX": 1950, - "trimY": 63, + "trimX": 72, + "trimY": 890, "width": 67, "height": 34, "rawWidth": 95, @@ -1396,11 +1488,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -38, "offsetY": 14, - "trimX": 810, - "trimY": 98, + "trimX": 79, + "trimY": 1090, "width": 13, "height": 12, "rawWidth": 95, @@ -1442,11 +1534,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -20, "offsetY": 14, - "trimX": 720, - "trimY": 110, + "trimX": 224, + "trimY": 873, "width": 39, "height": 14, "rawWidth": 95, @@ -1491,8 +1583,8 @@ "rotated": false, "offsetX": 4, "offsetY": 10, - "trimX": 449, - "trimY": 103, + "trimX": 177, + "trimY": 765, "width": 75, "height": 22, "rawWidth": 95, @@ -1537,8 +1629,8 @@ "rotated": false, "offsetX": 4, "offsetY": -3, - "trimX": 1621, - "trimY": 1, + "trimX": 1, + "trimY": 515, "width": 87, "height": 42, "rawWidth": 95, @@ -1580,11 +1672,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -11, "offsetY": -5, - "trimX": 1859, - "trimY": 45, + "trimX": 155, + "trimY": 873, "width": 67, "height": 34, "rawWidth": 95, @@ -1629,8 +1721,8 @@ "rotated": false, "offsetX": -11, "offsetY": -5, - "trimX": 1352, - "trimY": 91, + "trimX": 184, + "trimY": 423, "width": 71, "height": 36, "rawWidth": 95, @@ -1663,6 +1755,52 @@ ], "subMetas": {} }, + "aa3e6": { + "importer": "sprite-frame", + "uuid": "46594657-02d0-432c-bbad-dcbcad549216@aa3e6", + "displayName": "", + "id": "aa3e6", + "name": "SlashFX", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 1, + "width": 87, + "height": 97, + "rawWidth": 99, + "rawHeight": 99, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "ad487883-575b-4cdf-a4b8-ecd284aa53cb@6c48a", + "atlasUuid": "46594657-02d0-432c-bbad-dcbcad549216" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "813c5": { "importer": "sprite-frame", "uuid": "46594657-02d0-432c-bbad-dcbcad549216@813c5", @@ -1672,11 +1810,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -15, "offsetY": -32, - "trimX": 865, - "trimY": 78, + "trimX": 190, + "trimY": 1081, "width": 21, "height": 18, "rawWidth": 95, @@ -1721,8 +1859,8 @@ "rotated": true, "offsetX": 17, "offsetY": -26, - "trimX": 1744, - "trimY": 96, + "trimX": 94, + "trimY": 1029, "width": 31, "height": 32, "rawWidth": 95, @@ -1767,8 +1905,8 @@ "rotated": true, "offsetX": 15, "offsetY": -33, - "trimX": 700, - "trimY": 80, + "trimX": 124, + "trimY": 1062, "width": 47, "height": 18, "rawWidth": 95, @@ -1814,7 +1952,7 @@ "offsetX": 12, "offsetY": -28, "trimX": 1, - "trimY": 97, + "trimY": 884, "width": 69, "height": 30, "rawWidth": 95, @@ -1859,8 +1997,8 @@ "rotated": false, "offsetX": 13, "offsetY": -27, - "trimX": 72, - "trimY": 97, + "trimX": 1, + "trimY": 945, "width": 65, "height": 30, "rawWidth": 95, @@ -1902,11 +2040,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 14, "offsetY": -28, - "trimX": 250, - "trimY": 95, + "trimX": 223, + "trimY": 916, "width": 65, "height": 32, "rawWidth": 95, @@ -1948,11 +2086,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -15, "offsetY": -32, - "trimX": 854, - "trimY": 98, + "trimX": 33, + "trimY": 1033, "width": 19, "height": 18, "rawWidth": 95, @@ -1994,11 +2132,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -17, "offsetY": -33, - "trimX": 260, - "trimY": 76, + "trimX": 136, + "trimY": 940, "width": 17, "height": 18, "rawWidth": 95, @@ -2043,8 +2181,8 @@ "rotated": true, "offsetX": -25, "offsetY": -6, - "trimX": 1962, - "trimY": 34, + "trimX": 1, + "trimY": 916, "width": 27, "height": 66, "rawWidth": 95, @@ -2089,8 +2227,8 @@ "rotated": false, "offsetX": -1, "offsetY": 5, - "trimX": 1189, - "trimY": 1, + "trimX": 182, + "trimY": 461, "width": 73, "height": 76, "rawWidth": 95, @@ -2135,8 +2273,8 @@ "rotated": true, "offsetX": 3, "offsetY": 5, - "trimX": 628, - "trimY": 1, + "trimX": 90, + "trimY": 557, "width": 77, "height": 86, "rawWidth": 95, @@ -2178,11 +2316,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 7, "offsetY": 1, - "trimX": 96, - "trimY": 1, + "trimX": 1, + "trimY": 179, "width": 79, "height": 94, "rawWidth": 95, @@ -2224,11 +2362,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 1, "offsetY": 1, - "trimX": 1, - "trimY": 1, + "trimX": 100, + "trimY": 90, "width": 93, "height": 94, "rawWidth": 95, @@ -2270,11 +2408,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 4, "offsetY": 2, - "trimX": 177, - "trimY": 1, + "trimX": 1, + "trimY": 260, "width": 81, "height": 92, "rawWidth": 95, @@ -2316,11 +2454,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -30, "offsetY": 31, - "trimX": 645, - "trimY": 116, + "trimX": 210, + "trimY": 1087, "width": 11, "height": 20, "rawWidth": 95, @@ -2365,8 +2503,8 @@ "rotated": true, "offsetX": -31, "offsetY": -17, - "trimX": 1425, - "trimY": 89, + "trimX": 210, + "trimY": 1054, "width": 31, "height": 42, "rawWidth": 95, @@ -2408,11 +2546,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -31, "offsetY": -19, - "trimX": 824, - "trimY": 94, + "trimX": 33, + "trimY": 977, "width": 33, "height": 28, "rawWidth": 95, @@ -2457,8 +2595,8 @@ "rotated": false, "offsetX": -31, "offsetY": -16, - "trimX": 526, - "trimY": 103, + "trimX": 33, + "trimY": 1007, "width": 33, "height": 24, "rawWidth": 95, @@ -2500,11 +2638,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -30, "offsetY": 31, - "trimX": 2005, - "trimY": 99, + "trimX": 68, + "trimY": 1029, "width": 23, "height": 24, "rawWidth": 95, @@ -2549,8 +2687,8 @@ "rotated": false, "offsetX": 6, "offsetY": 17, - "trimX": 1617, - "trimY": 45, + "trimX": 177, + "trimY": 709, "width": 75, "height": 54, "rawWidth": 95, @@ -2595,8 +2733,8 @@ "rotated": false, "offsetX": 14, "offsetY": 1, - "trimX": 986, - "trimY": 1, + "trimX": 187, + "trimY": 335, "width": 67, "height": 86, "rawWidth": 95, @@ -2641,7 +2779,7 @@ "rotated": false, "offsetX": 15, "offsetY": -7, - "trimX": 1472, + "trimX": 199, "trimY": 1, "width": 55, "height": 76, @@ -2687,8 +2825,8 @@ "rotated": false, "offsetX": 3, "offsetY": -25, - "trimX": 1883, - "trimY": 1, + "trimX": 178, + "trimY": 627, "width": 77, "height": 40, "rawWidth": 95, @@ -2730,11 +2868,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -10, "offsetY": -22, - "trimX": 1472, - "trimY": 79, + "trimX": 1, + "trimY": 1054, "width": 55, "height": 46, "rawWidth": 95, @@ -2779,8 +2917,8 @@ "rotated": false, "offsetX": -31, "offsetY": -22, - "trimX": 1213, - "trimY": 97, + "trimX": 128, + "trimY": 978, "width": 25, "height": 30, "rawWidth": 95, @@ -2822,11 +2960,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -35, "offsetY": 12, - "trimX": 1895, - "trimY": 103, + "trimX": 164, + "trimY": 1087, "width": 21, "height": 24, "rawWidth": 95, @@ -2871,8 +3009,8 @@ "rotated": false, "offsetX": -22, "offsetY": 15, - "trimX": 824, - "trimY": 78, + "trimX": 214, + "trimY": 1038, "width": 39, "height": 14, "rawWidth": 95, @@ -2917,8 +3055,8 @@ "rotated": false, "offsetX": 2, "offsetY": 11, - "trimX": 449, - "trimY": 75, + "trimX": 1, + "trimY": 810, "width": 81, "height": 26, "rawWidth": 95, @@ -2960,11 +3098,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 21, "offsetY": 1, - "trimX": 645, - "trimY": 80, + "trimX": 220, + "trimY": 983, "width": 53, "height": 34, "rawWidth": 95, @@ -3009,8 +3147,8 @@ "rotated": false, "offsetX": 3, "offsetY": -4, - "trimX": 986, - "trimY": 89, + "trimX": 90, + "trimY": 517, "width": 87, "height": 38, "rawWidth": 95, @@ -3055,8 +3193,8 @@ "rotated": false, "offsetX": -6, "offsetY": -13, - "trimX": 1189, - "trimY": 79, + "trimX": 1, + "trimY": 866, "width": 71, "height": 16, "rawWidth": 95, @@ -3098,11 +3236,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -26, "offsetY": -11, - "trimX": 779, - "trimY": 98, + "trimX": 141, + "trimY": 890, "width": 29, "height": 12, "rawWidth": 95, @@ -3144,11 +3282,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -30, "offsetY": 31, - "trimX": 645, - "trimY": 116, + "trimX": 210, + "trimY": 1087, "width": 11, "height": 20, "rawWidth": 95, @@ -3190,11 +3328,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -31, "offsetY": -20, - "trimX": 139, - "trimY": 97, + "trimX": 1, + "trimY": 977, "width": 31, "height": 30, "rawWidth": 95, @@ -3236,11 +3374,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -31, "offsetY": -19, - "trimX": 824, - "trimY": 94, + "trimX": 33, + "trimY": 977, "width": 33, "height": 28, "rawWidth": 95, @@ -3285,8 +3423,8 @@ "rotated": false, "offsetX": -31, "offsetY": -16, - "trimX": 526, - "trimY": 103, + "trimX": 33, + "trimY": 1007, "width": 33, "height": 24, "rawWidth": 95, @@ -3328,11 +3466,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -30, "offsetY": 31, - "trimX": 2005, - "trimY": 99, + "trimX": 68, + "trimY": 1029, "width": 23, "height": 24, "rawWidth": 95, @@ -3377,8 +3515,8 @@ "rotated": false, "offsetX": 6, "offsetY": 17, - "trimX": 1710, - "trimY": 40, + "trimX": 165, + "trimY": 817, "width": 73, "height": 54, "rawWidth": 95, @@ -3420,11 +3558,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 15, "offsetY": -5, - "trimX": 1785, - "trimY": 45, + "trimX": 199, + "trimY": 79, "width": 55, "height": 72, "rawWidth": 95, @@ -3469,8 +3607,8 @@ "rotated": false, "offsetX": 3, "offsetY": -24, - "trimX": 1075, - "trimY": 89, + "trimX": 177, + "trimY": 669, "width": 77, "height": 38, "rawWidth": 95, @@ -3512,11 +3650,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -9, "offsetY": -31, - "trimX": 1950, - "trimY": 99, + "trimX": 49, + "trimY": 1054, "width": 53, "height": 28, "rawWidth": 95, @@ -3561,8 +3699,8 @@ "rotated": false, "offsetX": -31, "offsetY": -19, - "trimX": 561, - "trimY": 103, + "trimX": 128, + "trimY": 1010, "width": 25, "height": 24, "rawWidth": 95, @@ -3607,8 +3745,8 @@ "rotated": false, "offsetX": -30, "offsetY": -23, - "trimX": 588, - "trimY": 103, + "trimX": 128, + "trimY": 1036, "width": 25, "height": 24, "rawWidth": 95, @@ -3650,11 +3788,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 19, "offsetY": -40, - "trimX": 667, - "trimY": 116, + "trimX": 223, + "trimY": 1087, "width": 11, "height": 14, "rawWidth": 95, @@ -3699,8 +3837,8 @@ "rotated": false, "offsetX": -8, "offsetY": -33, - "trimX": 1154, - "trimY": 97, + "trimX": 155, + "trimY": 984, "width": 57, "height": 30, "rawWidth": 95, @@ -3742,11 +3880,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -14, "offsetY": -5, - "trimX": 1124, - "trimY": 1, + "trimX": 89, + "trimY": 636, "width": 63, "height": 86, "rawWidth": 95, @@ -3788,11 +3926,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -6, "offsetY": 5, - "trimX": 716, - "trimY": 1, + "trimX": 179, + "trimY": 539, "width": 75, "height": 86, "rawWidth": 95, @@ -3837,8 +3975,8 @@ "rotated": false, "offsetX": 2, "offsetY": 12, - "trimX": 446, - "trimY": 1, + "trimX": 93, + "trimY": 368, "width": 89, "height": 72, "rawWidth": 95, @@ -3883,8 +4021,8 @@ "rotated": true, "offsetX": 26, "offsetY": 3, - "trimX": 1710, - "trimY": 1, + "trimX": 1, + "trimY": 343, "width": 37, "height": 90, "rawWidth": 95, @@ -3929,8 +4067,8 @@ "rotated": true, "offsetX": 17, "offsetY": -34, - "trimX": 615, - "trimY": 80, + "trimX": 94, + "trimY": 1062, "width": 47, "height": 28, "rawWidth": 95, @@ -3975,8 +4113,8 @@ "rotated": false, "offsetX": 3, "offsetY": -41, - "trimX": 779, - "trimY": 112, + "trimX": 12, + "trimY": 1010, "width": 19, "height": 14, "rawWidth": 95, @@ -4018,11 +4156,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 19, "offsetY": -40, - "trimX": 667, - "trimY": 116, + "trimX": 223, + "trimY": 1087, "width": 11, "height": 14, "rawWidth": 95, @@ -4064,11 +4202,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 4, "offsetY": -40, - "trimX": 761, - "trimY": 110, + "trimX": 240, + "trimY": 841, "width": 15, "height": 16, "rawWidth": 95, @@ -4110,11 +4248,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 4, "offsetY": -38, - "trimX": 280, - "trimY": 76, + "trimX": 136, + "trimY": 960, "width": 17, "height": 16, "rawWidth": 95, @@ -4159,8 +4297,8 @@ "rotated": false, "offsetX": 19, "offsetY": -40, - "trimX": 800, - "trimY": 113, + "trimX": 79, + "trimY": 1074, "width": 13, "height": 14, "rawWidth": 95, @@ -4205,8 +4343,8 @@ "rotated": false, "offsetX": -8, "offsetY": -33, - "trimX": 720, - "trimY": 78, + "trimX": 155, + "trimY": 1016, "width": 57, "height": 30, "rawWidth": 95, @@ -4251,8 +4389,8 @@ "rotated": true, "offsetX": -14, "offsetY": -5, - "trimX": 1264, - "trimY": 1, + "trimX": 89, + "trimY": 701, "width": 63, "height": 86, "rawWidth": 95, @@ -4297,8 +4435,8 @@ "rotated": true, "offsetX": -6, "offsetY": 5, - "trimX": 804, - "trimY": 1, + "trimX": 1, + "trimY": 559, "width": 75, "height": 86, "rawWidth": 95, @@ -4343,8 +4481,8 @@ "rotated": false, "offsetX": 2, "offsetY": 12, - "trimX": 537, - "trimY": 1, + "trimX": 1, + "trimY": 382, "width": 89, "height": 72, "rawWidth": 95, @@ -4389,8 +4527,8 @@ "rotated": true, "offsetX": 27, "offsetY": 3, - "trimX": 1529, - "trimY": 1, + "trimX": 95, + "trimY": 325, "width": 41, "height": 90, "rawWidth": 95, @@ -4432,11 +4570,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 21, "offsetY": -19, - "trimX": 1895, - "trimY": 43, + "trimX": 68, + "trimY": 974, "width": 53, "height": 58, "rawWidth": 95, @@ -4481,8 +4619,8 @@ "rotated": true, "offsetX": 6, "offsetY": -33, - "trimX": 1918, - "trimY": 103, + "trimX": 1, + "trimY": 1029, "width": 23, "height": 30, "rawWidth": 95, diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index 6f665900..166a73b7 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -56,7 +56,7 @@ export enum CdType { export enum AType { linear = 0, // 直线 parabolic = 1, // 抛射物 - fixedStart = 2, // 固定在出发点 + fixedStart = 2, // 固定在出发点,物理攻击 fixedEnd = 3, // 固定在终点 StartEnd = 4, // 固定在出发点和终点 用于治疗和buff类技能 } @@ -261,6 +261,9 @@ export const SkillSet = { TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,CdType:1,AType:AType.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:0, debuff:0,deV:0,deC:0,deR:100,in:8,ap:100,cd:5,hit:1,hited:3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出石斧,造成100%攻击的伤害"}, + 6013:{uuid:6013,name:"普通攻击",for_hero:false,sp_name:"base6",path:"3036",quality:Quality.WHITE, TType:TType.Frontline,maxC:1, + TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,CdType:1,AType:AType.fixedStart,RType:RType.linear,EType:EType.animationEnd,fname:"max",flash:false,with:0, + debuff:0,deV:0,deC:0,deR:100,in:8,ap:100,cd:5,hit:1,hited:0.2,shield:0,heal:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出石斧,造成100%攻击的伤害"}, 6020:{uuid:6020,name:"冰暴",for_hero:true,sp_name:"bingyu",path:"3135",quality:Quality.BLUE, TType:TType.Frontline,maxC:1, TGroup:TGroup.Ally,SType:SType.damage,act:"atk",DTType:DTType.range,CdType:2,AType:AType.fixedEnd,RType:RType.fixed,EType:EType.timeEnd,fname:"max",flash:false,with:90, diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index 2dac207e..fb4ef604 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -41,8 +41,8 @@ export const MonList = [5201,5202,5203,5204,5205,5206,5219,5220,5221,5222,5223,5 export const Masters = [5001,5002,5003,5004] export const HeroPos={ - 0:{pos:v3(-290,10,0)}, - 1:{pos:v3(-200,0,0)}, + 0:{pos:v3(-290,0,0)}, + 1:{pos:v3(0,0,0)}, 2:{pos:v3(-100,0,0)}, } export const HQuality = { @@ -227,72 +227,72 @@ export const HeroInfo = { //主将 5001:{uuid:5001,name:"刺心.艾吉斯",path:"k1", quality:HQuality.BLUE,lv:1,kind:1, - type:HType.warrior,hp:50,ap:10,dis:600,cd:1.5,speed:50,skills:[6005,6022,6022], + type:HType.warrior,hp:5000,ap:10,dis:600,cd:1.5,speed:50,skills:[6013,6022,6022], buff:[ {buff_type:BuffAttr.PUNCTURE,value:1}, ],info:"剑类专精,穿刺伤害额外+10%"}, 5002:{uuid:5002,name:"飓风.格罗姆",path:"k2", quality:HQuality.BLUE,lv:1,kind:1, - type:HType.warrior,hp:50,ap:10,dis:600,cd:1.5,speed:50,skills:[6006,6022,6022], + type:HType.warrior,hp:5000,ap:10,dis:600,cd:1.5,speed:50,skills:[6006,6022,6022], buff:[ {buff_type:BuffAttr.WFUNY,value:10}, ],info:"斧类专精,风怒概率增加10%"}, 5003:{uuid:5003,name:"碎颅.赫克托",path:"k4", quality:HQuality.BLUE,lv:1,kind:1, - type:HType.warrior,hp:50,ap:10,dis:600,cd:1.5,speed:50,skills:[6007,6022,6022], + type:HType.warrior,hp:5000,ap:10,dis:600,cd:1.5,speed:50,skills:[6007,6022,6022], buff:[ {buff_type:BuffAttr.CRITICAL,value:10}, ],info:"锤类专精,暴击概率增加10%"}, 5004:{uuid:5004,name:"裂伤.塔米拉",path:"k3", quality:HQuality.BLUE,lv:1,kind:1, - type:HType.warrior,hp:50,ap:10,dis:600,cd:1.5,speed:50,skills:[6008,6022,6022], + type:HType.warrior,hp:5000,ap:10,dis:600,cd:1.5,speed:50,skills:[6008,6022,6022], buff:[ {buff_type:BuffAttr.BURN_COUNT,value:1}, ],info:"刀类专精,易伤效果额外持续1次"}, 5005:{uuid:5005,name:"幽灵射手",path:"a4", quality:HQuality.BLUE,lv:1,kind:2, - type:HType.remote,hp:50,ap:15,dis:600,cd:1.5,speed:50,skills:[6002,6022,6022], + type:HType.remote,hp:5000,ap:15,dis:600,cd:1.5,speed:50,skills:[6002,6022,6022], buff:[ ],info:"说明"}, 5006:{uuid:5006,name:"战争领主",path:"k5", quality:HQuality.BLUE,lv:1,kind:2, - type:HType.warrior,hp:50,ap:10,dis:600,cd:1.5,speed:50,skills:[6001,6022,6022], + type:HType.warrior,hp:5000,ap:10,dis:600,cd:1.5,speed:50,skills:[6001,6022,6022], buff:[ ],info:"说明"}, 5007:{uuid:5007,name:"混沌法师",path:"zh1", quality:HQuality.BLUE,lv:1,kind:2, - type:HType.mage,hp:50,ap:10,dis:600,cd:1.5,speed:50,skills:[6001,6022,6022], + type:HType.mage,hp:5000,ap:10,dis:600,cd:1.5,speed:50,skills:[6001,6022,6022], buff:[ ],info:"说明"}, 5008:{uuid:5008,name:"火焰法师",path:"zh2", quality:HQuality.BLUE,lv:1,kind:2, - type:HType.mage,hp:50,ap:15,dis:600,cd:1.5,speed:50,skills:[6001,6022,6022], + type:HType.mage,hp:5000,ap:15,dis:600,cd:1.5,speed:50,skills:[6001,6022,6022], buff:[ ],info:"说明"}, 5009:{uuid:5009,name:"风暴精灵",path:"m4", quality:HQuality.BLUE,lv:1,kind:2, - type:HType.mage,hp:50,ap:15,dis:600,cd:1.5,speed:50,skills:[6001,6022,6022], + type:HType.mage,hp:5000,ap:15,dis:600,cd:1.5,speed:50,skills:[6001,6022,6022], buff:[ ],info:"说明"}, 5010:{uuid:5010,name:"战争祭祀",path:"d2", quality:HQuality.BLUE,lv:1,kind:2, - type:HType.mage,hp:50,ap:10,dis:600,cd:1.5,speed:50,skills:[6001,6022,6022], + type:HType.mage,hp:5000,ap:10,dis:600,cd:1.5,speed:50,skills:[6001,6022,6022], buff:[ ],info:"说明"}, 5011:{uuid:5011,name:"暴风射手",path:"a5", quality:HQuality.BLUE,lv:1,kind:2, - type:HType.remote,hp:50,ap:15,dis:600,cd:1.5,speed:50,skills:[6002,6022,6022], + type:HType.remote,hp:5000,ap:15,dis:600,cd:1.5,speed:50,skills:[6002,6022,6022], buff:[ ],info:"说明"}, 5012:{uuid:5012,name:"苍穹射手",path:"a3", quality:HQuality.BLUE,lv:1,kind:1, - type:HType.remote,hp:50,ap:15,dis:600,cd:1.5,speed:50,skills:[6002,6022,6022], + type:HType.remote,hp:5000,ap:15,dis:600,cd:1.5,speed:50,skills:[6002,6022,6022], buff:[ ],info:"说明"}, @@ -300,7 +300,7 @@ export const HeroInfo = { //怪物 5201:{uuid:5201,name:"兽人战士",path:"mor1", quality:HQuality.GREEN,lv:1,kind:1, - type:HType.warrior,hp:25,ap:8,dis:200,cd:2,speed:45,skills:[6007], + type:HType.warrior,hp:25,ap:8,dis:90,cd:2,speed:45,skills:[6007], buff:[ ],info:"普通怪物-战士型"}, 5202:{uuid:5202,name:"兽人刺客",path:"mor2", quality:HQuality.GREEN,lv:1,kind:1, @@ -308,7 +308,7 @@ export const HeroInfo = { buff:[ ],info:"普通怪物-战士型"}, 5203:{uuid:5203,name:"兽人护卫",path:"mor3", quality:HQuality.GREEN,lv:1,kind:1, - type:HType.warrior,hp:25,ap:8,dis:200,cd:2,speed:45,skills:[6007], + type:HType.warrior,hp:25,ap:8,dis:90,cd:2,speed:45,skills:[6007], buff:[ ],info:"普通怪物-战士型"}, 5204:{uuid:5204,name:"石卫", path:"mgem1",quality:HQuality.GREEN,lv:1,kind:1, @@ -326,11 +326,11 @@ export const HeroInfo = { 5219:{uuid:5219,name:"牛头战士",path:"mn1", quality:HQuality.GREEN,lv:2,kind:1, - type:HType.warrior,hp:25,ap:8,dis:200,cd:2,speed:45,skills:[6007], + type:HType.warrior,hp:25,ap:8,dis:90,cd:2,speed:45,skills:[6007], buff:[ ],info:"普通怪物-战士型"}, 5220:{uuid:5220,name:"牛头战士",path:"mn2", quality:HQuality.GREEN,lv:1,kind:1, - type:HType.warrior,hp:25,ap:8,dis:200,cd:2,speed:45,skills:[6007], + type:HType.warrior,hp:25,ap:8,dis:90,cd:2,speed:45,skills:[6007], buff:[ ],info:"普通怪物-战士型"}, 5221:{uuid:5221,name:"牛头战士",path:"mn3", quality:HQuality.GREEN,lv:1,kind:1, @@ -338,11 +338,11 @@ export const HeroInfo = { buff:[ ],info:"普通怪物-战士型"}, 5222:{uuid:5222,name:"独眼巨人",path:"md1", quality:HQuality.GREEN,lv:1,kind:1, - type:HType.warrior,hp:25,ap:8,dis:200,cd:2,speed:45,skills:[6007], + type:HType.warrior,hp:25,ap:8,dis:90,cd:2,speed:45,skills:[6007], buff:[ ],info:"普通怪物-战士型"}, 5223:{uuid:5223,name:"独眼巨人",path:"md2", quality:HQuality.GREEN,lv:1,kind:1, - type:HType.warrior,hp:25,ap:8,dis:200,cd:2,speed:45,skills:[6007], + type:HType.warrior,hp:25,ap:8,dis:90,cd:2,speed:45,skills:[6007], buff:[ ],info:"普通怪物-战士型"}, 5224:{uuid:5224,name:"独眼巨人",path:"md3", quality:HQuality.GREEN,lv:1,kind:1, @@ -350,15 +350,15 @@ export const HeroInfo = { buff:[ ],info:"普通怪物-战士型"}, 5225:{uuid:5225,name:"精英独眼",path:"md4", quality:HQuality.BLUE,lv:1,kind:1, - type:HType.warrior,hp:45,ap:12,dis:200,cd:2,speed:25,skills:[6007], + type:HType.warrior,hp:45,ap:12,dis:300,cd:2,speed:25,skills:[6007], buff:[ ],info:"精英怪物-战士型"}, 5226:{uuid:5226,name:"精英牛头",path:"mn4", quality:HQuality.BLUE,lv:1,kind:1, - type:HType.warrior,hp:45,ap:12,dis:200,cd:2,speed:25,skills:[6007], + type:HType.warrior,hp:45,ap:12,dis:300,cd:2,speed:25,skills:[6007], buff:[ ],info:"精英怪物-战士型"}, 5227:{uuid:5227,name:"精英兽人",path:"mor4", quality:HQuality.BLUE,lv:1,kind:1, - type:HType.warrior,hp:45,ap:12,dis:200,cd:2,speed:25,skills:[6007], + type:HType.warrior,hp:45,ap:12,dis:300,cd:2,speed:25,skills:[6007], buff:[ ],info:"精英怪物-战士型"}, }; diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts index 7109e18e..bd1f20a3 100644 --- a/assets/script/game/hero/Hero.ts +++ b/assets/script/game/hero/Hero.ts @@ -5,7 +5,7 @@ import { smc } from "../common/SingletonModuleComp"; import { HeroModelComp } from "./HeroModelComp"; import { HeroViewComp } from "./HeroViewComp"; import { BoxSet, FacSet } from "../common/config/BoxSet"; -import { HeroInfo, HeroPos } from "../common/config/heroSet"; +import { HeroInfo, HeroPos, HType } from "../common/config/heroSet"; import { BattleMoveComp } from "../common/ecs/position/BattleMoveComp"; import { FriendModelComp } from "./FriendModel"; import { MasterModelComp } from "./MasterModel"; @@ -45,6 +45,7 @@ export class Hero extends ecs.Entity { var scene = smc.map.MapView.scene; node.parent = scene.entityLayer!.node! let pos=HeroPos[0].pos + if(HeroInfo[uuid].type==HType.warrior) pos=HeroPos[1].pos node.setPosition(pos) var hv = this.hero_init(uuid,node) hv.scale = 1; diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts index edf87b5f..f075a518 100644 --- a/assets/script/game/skills/SkillCom.ts +++ b/assets/script/game/skills/SkillCom.ts @@ -11,6 +11,7 @@ import { BezierMove } from "../BezierMove/BezierMove"; import { MonModelComp } from "../hero/MonModelComp"; import { FightSet } from "../common/config/Mission"; import { HeroModelComp } from "../hero/HeroModelComp"; +import { Skill } from "./Skill"; const { ccclass, property } = _decorator; @@ -134,12 +135,23 @@ export class SkillCom extends CCComp { } } break; - case AType.fixedStart: //都是buff - this.node.setPosition(this.startPos.x,this.startPos.y,0) - this.scheduleOnce(()=>{ - this.do_buff() - // console.log("[SkillCom]:fixedStart",SkillSet[this.s_uuid].in-0.2) - },SkillSet[this.s_uuid].in-0.2) + case AType.fixedStart: // + this.node.setPosition(this.startPos.x,this.startPos.y,0) + + if(this.node.getComponent(Animation)){ + let anim = this.node.getComponent(Animation); + //console.log("[SkillCom]:has anim",anim) + anim.on(Animation.EventType.FINISHED, this.onAnimationFinished, this); + } + if(this.node.getChildByName('anm')){ + if(this.node.getChildByName('anm').getComponent('sp.Skeleton')){ + //console.log("[SkillCom]:has spine",this.spine) + this.spine.setCompleteListener((trackEntry) => { + this.onAnimationFinished() + //console.log("[SkillCom]:[track %s][animation %s] complete: %s", trackEntry.trackIndex); + }); + } + } break; } @@ -147,6 +159,7 @@ export class SkillCom extends CCComp { } onAnimationFinished(){ + console.log("[SkillCom]:onAnimationFinished",this.s_uuid) if(SkillSet[this.s_uuid].EType==EType.timeEnd) return this.is_destroy=true } @@ -190,7 +203,7 @@ export class SkillCom extends CCComp { } this.hit_count++ // console.log("[SkillCom]:碰撞次数:技能次数:穿刺次数",this.hit_count,SkillSet[this.s_uuid].hit,this.puncture) - if(this.hit_count>=(SkillSet[this.s_uuid].hit+this.puncture)&&(SkillSet[this.s_uuid].DTType!=DTType.range)) this.is_destroy=true // 技能命中次数 + if(this.hit_count>=(SkillSet[this.s_uuid].hit+this.puncture)&&(SkillSet[this.s_uuid].DTType!=DTType.range)&&(SkillSet[this.s_uuid].EType!=EType.animationEnd)) this.is_destroy=true // 技能命中次数 } onBeginContact (seCol: Collider2D, oCol: Collider2D) { @@ -200,7 +213,7 @@ export class SkillCom extends CCComp { if(oCol.group!=this.group){ if(target == null) return; // console.log("[SkillCom]:onBeginContact oCol||seCol",oCol.node.position,seCol.node.position) - this.single_damage(target) + this.single_damage(target,SkillSet[this.s_uuid].DTType==DTType.range?true:false) // this.ent.destroy() } }