diff --git a/assets/resources/game/skills/anm/kingba.atlas b/assets/resources/game/skills/anm/kingba.atlas deleted file mode 100644 index a9223d05..00000000 --- a/assets/resources/game/skills/anm/kingba.atlas +++ /dev/null @@ -1,104 +0,0 @@ - -kingba.png -size: 236,675 -format: RGBA8888 -filter: Linear,Linear -repeat: none -WPS图片批量处理(4)/Flame_Side_01 - rotate: true - xy: 188, 2 - size: 52, 24 - orig: 154, 154 - offset: 3, 18 - index: -1 -WPS图片批量处理(4)/Flame_Side_02 - rotate: false - xy: 96, 4 - size: 90, 50 - orig: 154, 154 - offset: 13, 15 - index: -1 -WPS图片批量处理(4)/Flame_Side_03 - rotate: false - xy: 119, 354 - size: 114, 97 - orig: 154, 154 - offset: 8, 18 - index: -1 -WPS图片批量处理(4)/Flame_Side_04 - rotate: false - xy: 2, 558 - size: 118, 115 - orig: 154, 154 - offset: 17, 15 - index: -1 -WPS图片批量处理(4)/Flame_Side_05 - rotate: false - xy: 122, 557 - size: 112, 116 - orig: 154, 154 - offset: 26, 14 - index: -1 -WPS图片批量处理(4)/Flame_Side_06 - rotate: false - xy: 2, 335 - size: 112, 110 - orig: 154, 154 - offset: 27, 18 - index: -1 -WPS图片批量处理(4)/Flame_Side_07 - rotate: true - xy: 2, 447 - size: 109, 115 - orig: 154, 154 - offset: 34, 18 - index: -1 -WPS图片批量处理(4)/Flame_Side_08 - rotate: true - xy: 2, 223 - size: 110, 111 - orig: 154, 154 - offset: 35, 19 - index: -1 -WPS图片批量处理(4)/Flame_Side_09 - rotate: true - xy: 116, 252 - size: 100, 112 - orig: 154, 154 - offset: 42, 19 - index: -1 -WPS图片批量处理(4)/Flame_Side_10 - rotate: true - xy: 119, 453 - size: 102, 115 - orig: 154, 154 - offset: 46, 19 - index: -1 -WPS图片批量处理(4)/Flame_Side_11 - rotate: true - xy: 115, 148 - size: 102, 111 - orig: 154, 154 - offset: 49, 22 - index: -1 -WPS图片批量处理(4)/Flame_Side_12 - rotate: true - xy: 2, 125 - size: 96, 108 - orig: 154, 154 - offset: 55, 22 - index: -1 -WPS图片批量处理(4)/Flame_Side_13 - rotate: true - xy: 112, 56 - size: 90, 103 - orig: 154, 154 - offset: 62, 26 - index: -1 -WPS图片批量处理(4)/Flame_Side_14 - rotate: true - xy: 2, 45 - size: 78, 92 - orig: 154, 154 - offset: 68, 32 - index: -1 diff --git a/assets/resources/game/skills/anm/kingba.atlas.meta b/assets/resources/game/skills/anm/kingba.atlas.meta deleted file mode 100644 index ddffd0ab..00000000 --- a/assets/resources/game/skills/anm/kingba.atlas.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.1", - "importer": "*", - "imported": true, - "uuid": "76d1515f-07a8-4745-83ed-33f90a57809e", - "files": [ - ".atlas", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/anm/kingba.json b/assets/resources/game/skills/anm/kingba.json deleted file mode 100644 index 8e661d4c..00000000 --- a/assets/resources/game/skills/anm/kingba.json +++ /dev/null @@ -1,93 +0,0 @@ -{ -"skeleton": { "hash": "vU13C+Qq0PF/K6v7PJAK3IAkOa0=", "spine": "3.8.75", "x": -107, "y": -32, "width": 214, "height": 154 }, -"bones": [ - { "name": "root" }, - { "name": "man1", "parent": "root", "x": 30, "y": 45 }, - { "name": "man2", "parent": "root", "x": -30, "y": 45, "scaleX": -1 } -], -"slots": [ - { "name": "main", "bone": "man1", "attachment": "WPS图片批量处理(4)/Flame_Side_14" }, - { "name": "main2", "bone": "man2", "attachment": "WPS图片批量处理(4)/Flame_Side_14" } -], -"skins": [ - { - "name": "default", - "attachments": { - "main2": { - "WPS图片批量处理(4)/Flame_Side_01": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_02": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_03": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_04": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_05": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_06": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_07": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_08": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_09": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_10": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_11": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_12": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_13": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_14": { "width": 154, "height": 154 } - }, - "main": { - "WPS图片批量处理(4)/Flame_Side_01": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_02": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_03": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_04": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_05": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_06": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_07": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_08": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_09": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_10": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_11": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_12": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_13": { "width": 154, "height": 154 }, - "WPS图片批量处理(4)/Flame_Side_14": { "width": 154, "height": 154 } - } - } - } -], -"animations": { - "show": { - "slots": { - "main2": { - "attachment": [ - { "name": "WPS图片批量处理(4)/Flame_Side_01" }, - { "time": 0.0333, "name": "WPS图片批量处理(4)/Flame_Side_02" }, - { "time": 0.0667, "name": "WPS图片批量处理(4)/Flame_Side_03" }, - { "time": 0.1, "name": "WPS图片批量处理(4)/Flame_Side_04" }, - { "time": 0.1333, "name": "WPS图片批量处理(4)/Flame_Side_05" }, - { "time": 0.1667, "name": "WPS图片批量处理(4)/Flame_Side_06" }, - { "time": 0.2, "name": "WPS图片批量处理(4)/Flame_Side_07" }, - { "time": 0.2333, "name": "WPS图片批量处理(4)/Flame_Side_08" }, - { "time": 0.2667, "name": "WPS图片批量处理(4)/Flame_Side_09" }, - { "time": 0.3, "name": "WPS图片批量处理(4)/Flame_Side_10" }, - { "time": 0.3333, "name": "WPS图片批量处理(4)/Flame_Side_11" }, - { "time": 0.3667, "name": "WPS图片批量处理(4)/Flame_Side_12" }, - { "time": 0.4, "name": "WPS图片批量处理(4)/Flame_Side_13" }, - { "time": 0.4333, "name": "WPS图片批量处理(4)/Flame_Side_14" } - ] - }, - "main": { - "attachment": [ - { "name": "WPS图片批量处理(4)/Flame_Side_01" }, - { "time": 0.0333, "name": "WPS图片批量处理(4)/Flame_Side_02" }, - { "time": 0.0667, "name": "WPS图片批量处理(4)/Flame_Side_03" }, - { "time": 0.1, "name": "WPS图片批量处理(4)/Flame_Side_04" }, - { "time": 0.1333, "name": "WPS图片批量处理(4)/Flame_Side_05" }, - { "time": 0.1667, "name": "WPS图片批量处理(4)/Flame_Side_06" }, - { "time": 0.2, "name": "WPS图片批量处理(4)/Flame_Side_07" }, - { "time": 0.2333, "name": "WPS图片批量处理(4)/Flame_Side_08" }, - { "time": 0.2667, "name": "WPS图片批量处理(4)/Flame_Side_09" }, - { "time": 0.3, "name": "WPS图片批量处理(4)/Flame_Side_10" }, - { "time": 0.3333, "name": "WPS图片批量处理(4)/Flame_Side_11" }, - { "time": 0.3667, "name": "WPS图片批量处理(4)/Flame_Side_12" }, - { "time": 0.4, "name": "WPS图片批量处理(4)/Flame_Side_13" }, - { "time": 0.4333, "name": "WPS图片批量处理(4)/Flame_Side_14" } - ] - } - } - } -} -} \ No newline at end of file diff --git a/assets/resources/game/skills/anm/kingba.json.meta b/assets/resources/game/skills/anm/kingba.json.meta deleted file mode 100644 index 76e52037..00000000 --- a/assets/resources/game/skills/anm/kingba.json.meta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ver": "1.2.6", - "importer": "spine-data", - "imported": true, - "uuid": "96dcf100-dd7d-4372-b116-f902dbaa4785", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/anm/kingba.png b/assets/resources/game/skills/anm/kingba.png deleted file mode 100644 index b18c8e1f..00000000 Binary files a/assets/resources/game/skills/anm/kingba.png and /dev/null differ diff --git a/assets/resources/game/skills/anm/kingba.png.meta b/assets/resources/game/skills/anm/kingba.png.meta deleted file mode 100644 index 71724f5c..00000000 --- a/assets/resources/game/skills/anm/kingba.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "5bf19331-320d-4ccb-9e29-29f60946fefe", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "5bf19331-320d-4ccb-9e29-29f60946fefe@6c48a", - "displayName": "kingba", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "5bf19331-320d-4ccb-9e29-29f60946fefe", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "5bf19331-320d-4ccb-9e29-29f60946fefe@6c48a" - } -} diff --git a/assets/resources/game/skills/buff/to_buff.anim b/assets/resources/game/skills/buff/to_buff.anim index 235f24ec..6cecdf4d 100644 --- a/assets/resources/game/skills/buff/to_buff.anim +++ b/assets/resources/game/skills/buff/to_buff.anim @@ -22,12 +22,12 @@ "_events": [], "_embeddedPlayers": [], "_additiveSettings": { - "__id__": 12 + "__id__": 6 }, "_auxiliaryCurveEntries": [] }, { - "__type__": "cc.animation.VectorTrack", + "__type__": "cc.animation.ObjectTrack", "_binding": { "__type__": "cc.animation.TrackBinding", "path": { @@ -35,21 +35,9 @@ }, "proxy": null }, - "_channels": [ - { - "__id__": 4 - }, - { - "__id__": 6 - }, - { - "__id__": 8 - }, - { - "__id__": 10 - } - ], - "_nComponents": 3 + "_channel": { + "__id__": 4 + } }, { "__type__": "cc.animation.TrackPath", @@ -57,12 +45,12 @@ { "__id__": 3 }, - "eulerAngles" + "spriteFrame" ] }, { - "__type__": "cc.animation.HierarchyPath", - "path": "skill" + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" }, { "__type__": "cc.animation.Channel", @@ -71,173 +59,61 @@ } }, { - "__type__": "cc.RealCurve", + "__type__": "cc.ObjectCurve", "_times": [ 0, - 0.4166666567325592, - 0.8333333134651184 + 0.08333333333333333, + 0.16666666666666666, + 0.25, + 0.3333333333333333, + 0.4166666666666667, + 0.5, + 0.5833333333333334, + 0.6666666666666666, + 0.75 ], "_values": [ { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@e23f5", + "__expectedType__": "cc.SpriteFrame" }, { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@24262", + "__expectedType__": "cc.SpriteFrame" }, { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@6f3ad", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@b25c2", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@466e0", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@bde24", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@0f614", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@5450f", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@1b16f", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "093403fd-fec9-42ef-b952-5831234ff06e@37953", + "__expectedType__": "cc.SpriteFrame" } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 7 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.4166666567325592, - 0.8333333134651184 - ], - "_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 - }, - { - "__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__": 9 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.4166666567325592, - 0.8333333134651184 - ], - "_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": -180, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": -360, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 11 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [], - "_values": [], - "preExtrapolation": 1, - "postExtrapolation": 1 + ] }, { "__type__": "cc.AnimationClipAdditiveSettings", diff --git a/assets/resources/game/skills/buff_to.prefab b/assets/resources/game/skills/buff_to.prefab new file mode 100644 index 00000000..671b8c37 --- /dev/null +++ b/assets/resources/game/skills/buff_to.prefab @@ -0,0 +1,421 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "buff_to", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "buff_to", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + }, + { + "__id__": 18 + } + ], + "_prefab": { + "__id__": 20 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "skill", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 3 + } + ], + "_active": true, + "_components": [ + { + "__id__": 9 + } + ], + "_prefab": { + "__id__": 11 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Image_Effect_Star01_Yellow", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 4 + }, + { + "__id__": 6 + } + ], + "_prefab": { + "__id__": 8 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 3 + }, + "_enabled": true, + "__prefab": { + "__id__": 5 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 92, + "height": 92 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2dvPS54+BHsYOdlT14ZqFz" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 3 + }, + "_enabled": true, + "__prefab": { + "__id__": 7 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "260d01c4-5936-4c90-8ff9-b892c60b2e48@ce362", + "__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": "bb9AuVg7ZDuq7LRqIEr+V1" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1f72gYz6FJlY6VbZn57SZn", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 48, + "height": 48 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b4sNQPJWFKha7x75SWXmRj" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7a5LvbdlxEc6FKa7cun2oB", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 80 + }, + "_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__": 15 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8ahZv91itPcYJm8S0veHYl" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "2202bddf-38fc-4b0e-a004-ef962f61f49d", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "2202bddf-38fc-4b0e-a004-ef962f61f49d", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7cJdSTCj5Eu4vDiD6FPj8P" + }, + { + "__type__": "f680dkagx9PmbfqtF463/Ua", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "speed": 600, + "controlPointSide": 1, + "controlPointOffset": 1, + "controlPointRandomness": 0.3, + "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": "46vE3s9lxEkZFP/Fm7EHJD" + }, + { + "__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/kingba.prefab.meta b/assets/resources/game/skills/buff_to.prefab.meta similarity index 62% rename from assets/resources/game/skills/kingba.prefab.meta rename to assets/resources/game/skills/buff_to.prefab.meta index 29abee32..4a6ba071 100644 --- a/assets/resources/game/skills/kingba.prefab.meta +++ b/assets/resources/game/skills/buff_to.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "493a2c6c-c6f5-4f46-9658-b1da271ad853", + "uuid": "500de59f-c924-4c05-be8d-586bbe942397", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "kingba" + "syncNodeName": "buff_to" } } diff --git a/assets/resources/game/skills/kingba.prefab b/assets/resources/game/skills/kingba.prefab deleted file mode 100644 index 0971af1f..00000000 --- a/assets/resources/game/skills/kingba.prefab +++ /dev/null @@ -1,260 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "kingba", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "kingba", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - } - ], - "_active": true, - "_components": [ - { - "__id__": 8 - }, - { - "__id__": 10 - } - ], - "_prefab": { - "__id__": 12 - }, - "_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": "anm", - "_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.7, - "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": 214, - "height": 154 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.2077922077922078 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "43ucwKXvZIjpuRMb6AMdcx" - }, - { - "__type__": "sp.Skeleton", - "_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 - }, - "_skeletonData": { - "__uuid__": "96dcf100-dd7d-4372-b116-f902dbaa4785", - "__expectedType__": "sp.SkeletonData" - }, - "defaultSkin": "default", - "defaultAnimation": "show", - "_premultipliedAlpha": true, - "_timeScale": 1, - "_preCacheMode": 1, - "_cacheMode": 1, - "_sockets": [], - "_useTint": false, - "_debugMesh": false, - "_debugBones": false, - "_debugSlots": false, - "_enableBatch": false, - "loop": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f4WMZg9HNFq4HW5qE5uL4x" - }, - { - "__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": 120, - "height": 80 - }, - "_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.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/skills3.plist b/assets/resources/game/skills/skills3.plist index bd17fe5c..4cab2db2 100644 --- a/assets/resources/game/skills/skills3.plist +++ b/assets/resources/game/skills/skills3.plist @@ -15,7 +15,7 @@ spriteSourceSize {160,48} textureRect - {{164,613},{160,48}} + {{164,1648},{160,48}} textureRotated @@ -30,7 +30,7 @@ spriteSourceSize {161,151} textureRect - {{167,1},{161,151}} + {{167,1036},{161,151}} textureRotated @@ -45,7 +45,7 @@ spriteSourceSize {161,151} textureRect - {{330,1},{161,151}} + {{330,1036},{161,151}} textureRotated @@ -60,7 +60,7 @@ spriteSourceSize {161,151} textureRect - {{167,154},{161,151}} + {{167,1189},{161,151}} textureRotated @@ -75,7 +75,7 @@ spriteSourceSize {161,151} textureRect - {{1,167},{161,151}} + {{1,1202},{161,151}} textureRotated @@ -90,7 +90,7 @@ spriteSourceSize {161,151} textureRect - {{330,164},{161,151}} + {{330,1199},{161,151}} textureRotated @@ -105,7 +105,7 @@ spriteSourceSize {161,151} textureRect - {{164,307},{161,151}} + {{164,1342},{161,151}} textureRotated @@ -120,7 +120,7 @@ spriteSourceSize {161,151} textureRect - {{1,320},{161,151}} + {{1,1355},{161,151}} textureRotated @@ -135,7 +135,7 @@ spriteSourceSize {161,151} textureRect - {{327,327},{161,151}} + {{327,1362},{161,151}} textureRotated @@ -150,7 +150,7 @@ spriteSourceSize {161,151} textureRect - {{164,460},{161,151}} + {{164,1495},{161,151}} textureRotated @@ -165,7 +165,7 @@ spriteSourceSize {161,151} textureRect - {{1,473},{161,151}} + {{1,1508},{161,151}} textureRotated @@ -180,7 +180,7 @@ spriteSourceSize {161,151} textureRect - {{327,490},{161,151}} + {{327,1525},{161,151}} textureRotated @@ -195,7 +195,7 @@ spriteSourceSize {64,64} textureRect - {{157,663},{64,64}} + {{157,1698},{64,64}} textureRotated @@ -210,7 +210,7 @@ spriteSourceSize {64,64} textureRect - {{157,729},{64,64}} + {{157,1764},{64,64}} textureRotated @@ -225,7 +225,7 @@ spriteSourceSize {64,64} textureRect - {{223,663},{64,64}} + {{223,1698},{64,64}} textureRotated @@ -240,7 +240,7 @@ spriteSourceSize {64,64} textureRect - {{223,729},{64,64}} + {{223,1764},{64,64}} textureRotated @@ -255,7 +255,7 @@ spriteSourceSize {64,64} textureRect - {{289,663},{64,64}} + {{289,1698},{64,64}} textureRotated @@ -270,7 +270,7 @@ spriteSourceSize {64,64} textureRect - {{289,729},{64,64}} + {{289,1764},{64,64}} textureRotated @@ -285,7 +285,7 @@ spriteSourceSize {64,64} textureRect - {{355,653},{64,64}} + {{355,1688},{64,64}} textureRotated @@ -300,7 +300,7 @@ spriteSourceSize {64,64} textureRect - {{421,653},{64,64}} + {{421,1688},{64,64}} textureRotated @@ -315,7 +315,7 @@ spriteSourceSize {64,64} textureRect - {{355,719},{64,64}} + {{355,1754},{64,64}} textureRotated @@ -330,7 +330,7 @@ spriteSourceSize {140,50} textureRect - {{105,663},{140,50}} + {{105,1698},{140,50}} textureRotated @@ -345,7 +345,7 @@ spriteSourceSize {140,50} textureRect - {{1,663},{140,50}} + {{1,1698},{140,50}} textureRotated @@ -360,7 +360,7 @@ spriteSourceSize {140,50} textureRect - {{53,663},{140,50}} + {{53,1698},{140,50}} textureRotated @@ -375,7 +375,7 @@ spriteSourceSize {140,50} textureRect - {{105,663},{140,50}} + {{105,1698},{140,50}} textureRotated @@ -390,7 +390,157 @@ spriteSourceSize {164,164} textureRect - {{1,1},{164,164}} + {{1,1036},{164,164}} + textureRotated + + + skeleton-Fx3_0.png + + aliases + + spriteOffset + {0,0} + spriteSize + {232,205} + spriteSourceSize + {232,205} + textureRect + {{1,1},{232,205}} + textureRotated + + + skeleton-Fx3_10.png + + aliases + + spriteOffset + {0,0} + spriteSize + {232,205} + spriteSourceSize + {232,205} + textureRect + {{235,415},{232,205}} + textureRotated + + + skeleton-Fx3_12.png + + aliases + + spriteOffset + {0,0} + spriteSize + {232,205} + spriteSourceSize + {232,205} + textureRect + {{1,622},{232,205}} + textureRotated + + + skeleton-Fx3_14.png + + aliases + + spriteOffset + {0,0} + spriteSize + {232,205} + spriteSourceSize + {232,205} + textureRect + {{235,622},{232,205}} + textureRotated + + + skeleton-Fx3_16.png + + aliases + + spriteOffset + {0,0} + spriteSize + {232,205} + spriteSourceSize + {232,205} + textureRect + {{1,829},{232,205}} + textureRotated + + + skeleton-Fx3_17.png + + aliases + + spriteOffset + {0,0} + spriteSize + {232,205} + spriteSourceSize + {232,205} + textureRect + {{235,829},{232,205}} + textureRotated + + + skeleton-Fx3_2.png + + aliases + + spriteOffset + {0,0} + spriteSize + {232,205} + spriteSourceSize + {232,205} + textureRect + {{235,1},{232,205}} + textureRotated + + + skeleton-Fx3_4.png + + aliases + + spriteOffset + {0,0} + spriteSize + {232,205} + spriteSourceSize + {232,205} + textureRect + {{1,208},{232,205}} + textureRotated + + + skeleton-Fx3_6.png + + aliases + + spriteOffset + {0,0} + spriteSize + {232,205} + spriteSourceSize + {232,205} + textureRect + {{235,208},{232,205}} + textureRotated + + + skeleton-Fx3_8.png + + aliases + + spriteOffset + {0,0} + spriteSize + {232,205} + spriteSourceSize + {232,205} + textureRect + {{1,415},{232,205}} textureRotated @@ -406,9 +556,9 @@ realTextureFileName skills3.png size - {486,804} + {486,1839} smartupdate - $TexturePacker:SmartUpdate:8b0e27e488ee7b7f830518fe0ef34d37:ad87ac2c68ffcf005bfcb3129acb0b10:afd4b735e5ba2b868102353eb6164dcd$ + $TexturePacker:SmartUpdate:037794f6e7e79fb256cd5d8e6b94643b:149655ab843ff4104e7d012a1ab13c05:afd4b735e5ba2b868102353eb6164dcd$ textureFileName skills3.png diff --git a/assets/resources/game/skills/skills3.plist.meta b/assets/resources/game/skills/skills3.plist.meta index 87bbdb29..ed125fd3 100644 --- a/assets/resources/game/skills/skills3.plist.meta +++ b/assets/resources/game/skills/skills3.plist.meta @@ -7,6 +7,98 @@ ".json" ], "subMetas": { + "24262": { + "importer": "sprite-frame", + "uuid": "093403fd-fec9-42ef-b952-5831234ff06e@24262", + "displayName": "", + "id": "24262", + "name": "skeleton-Fx3_2", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 235, + "trimY": 1, + "width": 232, + "height": 205, + "rawWidth": 232, + "rawHeight": 205, + "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": "ebe57f11-acc7-4969-a421-464c625f2041@6c48a", + "atlasUuid": "093403fd-fec9-42ef-b952-5831234ff06e" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "37953": { + "importer": "sprite-frame", + "uuid": "093403fd-fec9-42ef-b952-5831234ff06e@37953", + "displayName": "", + "id": "37953", + "name": "skeleton-Fx3_17", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 235, + "trimY": 829, + "width": 232, + "height": 205, + "rawWidth": 232, + "rawHeight": 205, + "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": "ebe57f11-acc7-4969-a421-464c625f2041@6c48a", + "atlasUuid": "093403fd-fec9-42ef-b952-5831234ff06e" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "46592": { "importer": "sprite-frame", "uuid": "093403fd-fec9-42ef-b952-5831234ff06e@46592", @@ -20,7 +112,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 1, - "trimY": 663, + "trimY": 1698, "width": 140, "height": 50, "rawWidth": 140, @@ -66,7 +158,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 327, - "trimY": 327, + "trimY": 1362, "width": 161, "height": 151, "rawWidth": 161, @@ -112,7 +204,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 167, - "trimY": 1, + "trimY": 1036, "width": 161, "height": 151, "rawWidth": 161, @@ -158,7 +250,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 289, - "trimY": 729, + "trimY": 1764, "width": 64, "height": 64, "rawWidth": 64, @@ -204,7 +296,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 164, - "trimY": 613, + "trimY": 1648, "width": 160, "height": 48, "rawWidth": 160, @@ -250,7 +342,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 330, - "trimY": 1, + "trimY": 1036, "width": 161, "height": 151, "rawWidth": 161, @@ -296,7 +388,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 167, - "trimY": 154, + "trimY": 1189, "width": 161, "height": 151, "rawWidth": 161, @@ -342,7 +434,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 1, - "trimY": 167, + "trimY": 1202, "width": 161, "height": 151, "rawWidth": 161, @@ -388,7 +480,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 330, - "trimY": 164, + "trimY": 1199, "width": 161, "height": 151, "rawWidth": 161, @@ -434,7 +526,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 164, - "trimY": 307, + "trimY": 1342, "width": 161, "height": 151, "rawWidth": 161, @@ -480,7 +572,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 1, - "trimY": 320, + "trimY": 1355, "width": 161, "height": 151, "rawWidth": 161, @@ -526,7 +618,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 164, - "trimY": 460, + "trimY": 1495, "width": 161, "height": 151, "rawWidth": 161, @@ -572,7 +664,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 1, - "trimY": 473, + "trimY": 1508, "width": 161, "height": 151, "rawWidth": 161, @@ -618,7 +710,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 327, - "trimY": 490, + "trimY": 1525, "width": 161, "height": 151, "rawWidth": 161, @@ -664,7 +756,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 157, - "trimY": 663, + "trimY": 1698, "width": 64, "height": 64, "rawWidth": 64, @@ -710,7 +802,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 157, - "trimY": 729, + "trimY": 1764, "width": 64, "height": 64, "rawWidth": 64, @@ -756,7 +848,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 223, - "trimY": 663, + "trimY": 1698, "width": 64, "height": 64, "rawWidth": 64, @@ -802,7 +894,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 223, - "trimY": 729, + "trimY": 1764, "width": 64, "height": 64, "rawWidth": 64, @@ -848,7 +940,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 289, - "trimY": 663, + "trimY": 1698, "width": 64, "height": 64, "rawWidth": 64, @@ -894,7 +986,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 355, - "trimY": 653, + "trimY": 1688, "width": 64, "height": 64, "rawWidth": 64, @@ -940,7 +1032,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 421, - "trimY": 653, + "trimY": 1688, "width": 64, "height": 64, "rawWidth": 64, @@ -986,7 +1078,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 355, - "trimY": 719, + "trimY": 1754, "width": 64, "height": 64, "rawWidth": 64, @@ -1032,7 +1124,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 105, - "trimY": 663, + "trimY": 1698, "width": 140, "height": 50, "rawWidth": 140, @@ -1078,7 +1170,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 53, - "trimY": 663, + "trimY": 1698, "width": 140, "height": 50, "rawWidth": 140, @@ -1124,7 +1216,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 105, - "trimY": 663, + "trimY": 1698, "width": 140, "height": 50, "rawWidth": 140, @@ -1170,7 +1262,7 @@ "offsetX": 0, "offsetY": 0, "trimX": 1, - "trimY": 1, + "trimY": 1036, "width": 164, "height": 164, "rawWidth": 164, @@ -1202,6 +1294,374 @@ ".json" ], "subMetas": {} + }, + "e23f5": { + "importer": "sprite-frame", + "uuid": "093403fd-fec9-42ef-b952-5831234ff06e@e23f5", + "displayName": "", + "id": "e23f5", + "name": "skeleton-Fx3_0", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 1, + "width": 232, + "height": 205, + "rawWidth": 232, + "rawHeight": 205, + "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": "ebe57f11-acc7-4969-a421-464c625f2041@6c48a", + "atlasUuid": "093403fd-fec9-42ef-b952-5831234ff06e" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "bde24": { + "importer": "sprite-frame", + "uuid": "093403fd-fec9-42ef-b952-5831234ff06e@bde24", + "displayName": "", + "id": "bde24", + "name": "skeleton-Fx3_10", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 235, + "trimY": 415, + "width": 232, + "height": 205, + "rawWidth": 232, + "rawHeight": 205, + "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": "ebe57f11-acc7-4969-a421-464c625f2041@6c48a", + "atlasUuid": "093403fd-fec9-42ef-b952-5831234ff06e" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "0f614": { + "importer": "sprite-frame", + "uuid": "093403fd-fec9-42ef-b952-5831234ff06e@0f614", + "displayName": "", + "id": "0f614", + "name": "skeleton-Fx3_12", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 622, + "width": 232, + "height": 205, + "rawWidth": 232, + "rawHeight": 205, + "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": "ebe57f11-acc7-4969-a421-464c625f2041@6c48a", + "atlasUuid": "093403fd-fec9-42ef-b952-5831234ff06e" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "5450f": { + "importer": "sprite-frame", + "uuid": "093403fd-fec9-42ef-b952-5831234ff06e@5450f", + "displayName": "", + "id": "5450f", + "name": "skeleton-Fx3_14", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 235, + "trimY": 622, + "width": 232, + "height": 205, + "rawWidth": 232, + "rawHeight": 205, + "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": "ebe57f11-acc7-4969-a421-464c625f2041@6c48a", + "atlasUuid": "093403fd-fec9-42ef-b952-5831234ff06e" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "1b16f": { + "importer": "sprite-frame", + "uuid": "093403fd-fec9-42ef-b952-5831234ff06e@1b16f", + "displayName": "", + "id": "1b16f", + "name": "skeleton-Fx3_16", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 829, + "width": 232, + "height": 205, + "rawWidth": 232, + "rawHeight": 205, + "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": "ebe57f11-acc7-4969-a421-464c625f2041@6c48a", + "atlasUuid": "093403fd-fec9-42ef-b952-5831234ff06e" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "6f3ad": { + "importer": "sprite-frame", + "uuid": "093403fd-fec9-42ef-b952-5831234ff06e@6f3ad", + "displayName": "", + "id": "6f3ad", + "name": "skeleton-Fx3_4", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 208, + "width": 232, + "height": 205, + "rawWidth": 232, + "rawHeight": 205, + "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": "ebe57f11-acc7-4969-a421-464c625f2041@6c48a", + "atlasUuid": "093403fd-fec9-42ef-b952-5831234ff06e" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "b25c2": { + "importer": "sprite-frame", + "uuid": "093403fd-fec9-42ef-b952-5831234ff06e@b25c2", + "displayName": "", + "id": "b25c2", + "name": "skeleton-Fx3_6", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 235, + "trimY": 208, + "width": 232, + "height": 205, + "rawWidth": 232, + "rawHeight": 205, + "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": "ebe57f11-acc7-4969-a421-464c625f2041@6c48a", + "atlasUuid": "093403fd-fec9-42ef-b952-5831234ff06e" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "466e0": { + "importer": "sprite-frame", + "uuid": "093403fd-fec9-42ef-b952-5831234ff06e@466e0", + "displayName": "", + "id": "466e0", + "name": "skeleton-Fx3_8", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 415, + "width": 232, + "height": 205, + "rawWidth": 232, + "rawHeight": 205, + "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": "ebe57f11-acc7-4969-a421-464c625f2041@6c48a", + "atlasUuid": "093403fd-fec9-42ef-b952-5831234ff06e" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} } }, "userData": { diff --git a/assets/resources/game/skills/skills3.png b/assets/resources/game/skills/skills3.png index ed094228..6ab16e86 100644 Binary files a/assets/resources/game/skills/skills3.png and b/assets/resources/game/skills/skills3.png differ diff --git a/assets/resources/game/skills/zhaohuan.prefab b/assets/resources/game/skills/zhaohuan.prefab index a1617ab2..7b42987f 100644 --- a/assets/resources/game/skills/zhaohuan.prefab +++ b/assets/resources/game/skills/zhaohuan.prefab @@ -35,13 +35,10 @@ }, { "__id__": 12 - }, - { - "__id__": 14 } ], "_prefab": { - "__id__": 16 + "__id__": 14 }, "_lpos": { "__type__": "cc.Vec3", @@ -174,8 +171,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 120, - "height": 80 + "width": 232, + "height": 205 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -236,7 +233,7 @@ "fileId": "7cJdSTCj5Eu4vDiD6FPj8P" }, { - "__type__": "9e0d3yayihFMKm6st+kCG3D", + "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -247,29 +244,38 @@ "__prefab": { "__id__": 13 }, + "_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@e23f5", + "__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": "d9m8Z9r0FAn79RIXwYOlkG" - }, - { - "__type__": "eb0dfnp0SlNS7Xv5j0GiULm", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1c21gJ3aJD87IqfuwedMbd" + "fileId": "21toy2ysNBiop+Ii3z0Ykg" }, { "__type__": "cc.PrefabInfo", diff --git a/assets/script/game/common/config/GameEvent.ts b/assets/script/game/common/config/GameEvent.ts index a3a1a7f9..8573bc34 100644 --- a/assets/script/game/common/config/GameEvent.ts +++ b/assets/script/game/common/config/GameEvent.ts @@ -22,6 +22,7 @@ export enum GameEvent { MaxSkill = "MaxSkill", UseEquipCard = "UseEquipCard", CallHero = "CallHero", + Zhaohuan = "Zhaohuan", MissionLoss = "MissionLoss", MissionWin = "MissionWin", MissionStart = "MissionStart", diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index 39387ea0..4a1fbb48 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -40,6 +40,7 @@ export enum SType { heal = 1, shield = 2, buff = 3, + zhaohuan = 4, } //技能释放cd: 0:技能配置的cd,1:HeroViewComp.cd 值,2:HeroViewComp.pw:0值,当HeroViewComppw==HeroViewComp.pwm值是 释放 export enum CdType { @@ -185,7 +186,7 @@ hp:增加当前生命比例 cd:buff/debuff持续时间 /debhit:1,hited:伤害时间 shield:增加护盾占最大生命比例 -speed:移动速度 +heal:0,speed:移动速度 hero:召唤物英雄id cost:10,info:技能描述 @@ -208,101 +209,101 @@ export const getSkills=(quality:number)=>{ export const SkillSet = { 6001:{uuid:6001,name:"凛冬之触",for_hero:false,sp_name:"greenball",path:"3034",quality:Quality.WHITE, TType:TType.Frontline,maxC:1, 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:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"向最前方敌人释放寒冰弹,造成100%攻击的伤害"}, + debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"向最前方敌人释放寒冰弹,造成100%攻击的伤害"}, 6002:{uuid:6002,name:"穿心箭矢",for_hero:false,sp_name:"arrow",path:"3037",quality:Quality.WHITE, TType:TType.Frontline,maxC:1, TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,CdType:1,AType:AType.parabolic,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:0, - debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"向最前方敌人释放箭矢,造成100%攻击的伤害"}, + debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"向最前方敌人释放箭矢,造成100%攻击的伤害"}, - 6003:{uuid:6003,name:"神圣护盾",for_hero:false,sp_name:"shield",path:"3045",quality:Quality.WHITE, TType:TType.Frontline,maxC:1, - TGroup:TGroup.Self,SType:SType.shield,act:"atk",DTType:DTType.single,CdType:2,AType:AType.linear,RType:RType.linear,EType:EType.animationEnd,fname:"max",flash:false,with:0, - debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:30,speed:720,hero:0,cost:10,info:"召唤圣盾保护自己,可以抵御3次攻击"}, + 6003:{uuid:6003,name:"护盾",for_hero:true,sp_name:"buff_to",path:"3045",quality:Quality.BLUE, TType:TType.Frontline,maxC:1, + TGroup:TGroup.Team,SType:SType.shield,act:"atk",DTType:DTType.single,CdType:2,AType:AType.StartEnd,RType:RType.fixed,EType:EType.timeEnd,fname:"max",flash:false,with:0, + debuff:0,deV:0,deC:0,deR:100,in:1,ap:0,cd:10,hit:1,hited:0.3,shield:2,heal:0,speed:720,hero:0,cost:10,info:"为最前排队友召唤一个可以抵御2次攻击的圣盾(最高叠加到6次)"}, - 6004:{uuid:6004,name:"自愈", for_hero:true, sp_name:"heath_small",path:"3056",quality:Quality.GREEN, TType:TType.Frontline,maxC:1, - TGroup:TGroup.Self,SType:SType.heal,act:"atk",DTType:DTType.single,CdType:2,AType:AType.StartEnd,RType:RType.fixed,EType:EType.timeEnd,fname:"max",flash:false,with:0, - debuff:0,deV:0,deC:0,deR:100,in:1,ap:0,cd:5,hit:0,hited:0,shield:0,speed:0,hero:0,cost:10,info:"主动:自己回复自身5%最大生命值的生命"}, + 6004:{uuid:6004,name:"治疗", for_hero:true, sp_name:"heath_small",path:"3056",quality:Quality.GREEN, TType:TType.Frontline,maxC:1, + TGroup:TGroup.Team,SType:SType.heal,act:"atk",DTType:DTType.single,CdType:2,AType:AType.StartEnd,RType:RType.fixed,EType:EType.timeEnd,fname:"max",flash:false,with:0, + debuff:0,deV:0,deC:0,deR:100,in:1,ap:0,cd:5,hit:0,hited:0,shield:0,heal:10,speed:0,hero:0,cost:10,info:"回复最前排队友10%最大生命值的生命"}, 6005:{uuid:6005,name:"基础打击",for_hero:false,sp_name:"base1",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.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:0, - debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出铁斧,造成100%攻击的伤害"}, + debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出铁斧,造成100%攻击的伤害"}, 6006:{uuid:6006,name:"基础打击",for_hero:false,sp_name:"base2",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.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:0, - debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出铁斧,造成100%攻击的伤害"}, + debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出铁斧,造成100%攻击的伤害"}, 6007:{uuid:6007,name:"基础打击",for_hero:false,sp_name:"base3",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.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:0, - debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出铁斧,造成100%攻击的伤害"}, - 6008:{uuid:6008,name:"基础打击",for_hero:false,sp_name:"base4",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.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:90, - debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出铁斧,造成100%攻击的伤害"}, + debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出铁斧,造成100%攻击的伤害"}, + 6008:{uuid:6008,name:"基础打击",for_hero:false,sp_name:"base4",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.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:90, + debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出铁斧,造成100%攻击的伤害"}, 6009:{uuid:6009,name:"铁斧打击",for_hero:false,sp_name:"base_ft",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.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:0, - debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出铁斧,造成100%攻击的伤害"}, + debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出铁斧,造成100%攻击的伤害"}, 6010:{uuid:6010,name:"木棍打击",for_hero:false,sp_name:"base_mg",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.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:0, - debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出木棍,造成100%攻击的伤害"}, + debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出木棍,造成100%攻击的伤害"}, 6011:{uuid:6011,name:"飞刀打击",for_hero:false,sp_name:"mon_xd",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.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:0, - debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出飞刀,造成100%攻击的伤害"}, + debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出飞刀,造成100%攻击的伤害"}, 6012:{uuid:6012,name:"石斧打击",for_hero:false,sp_name:"base_sf",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.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:0, - debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"向最前方敌人扔出石斧,造成100%攻击的伤害"}, + debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:100,cd:5,hit:1,hited:0.3,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:"max",DTType:DTType.range,CdType:2,AType:AType.fixedEnd,RType:RType.fixed,EType:EType.timeEnd,fname:"max",flash:false,with:90, - debuff:4,deV:0,deC:0,deR:100,in:4,ap:80,cd:5,hit:1,hited:1,shield:0,speed:720,hero:0,cost:10,info:"射出能量暴风箭攻击最前方范围敌人,每波造成80%攻击的伤害"}, + debuff:4,deV:0,deC:0,deR:100,in:4,ap:80,cd:5,hit:1,hited:1,shield:0,heal:0,speed:720,hero:0,cost:10,info:"射出能量暴风箭攻击最前方范围敌人,每波造成80%攻击的伤害"}, 6021:{uuid:6021,name:"火龙",for_hero:true,sp_name:"firequan",path:"3061",quality:Quality.BLUE, TType:TType.Frontline,maxC:1, TGroup:TGroup.Ally,SType:SType.damage,act:"max",DTType:DTType.range,CdType:2,AType:AType.linear,RType:RType.linear,EType:EType.timeEnd,fname:"max",flash:false,with:90, - debuff:0,deV:0,deC:0,deR:100,in:10,ap:100,cd:5,hit:1,hited:1,shield:0,speed:80,hero:0,cost:10,info:"召唤烈焰攻击前方敌人,造成200%攻击的伤害,烈焰维持3秒"}, + debuff:0,deV:0,deC:0,deR:100,in:10,ap:100,cd:5,hit:1,hited:1,shield:0,heal:0,speed:80,hero:0,cost:10,info:"召唤烈焰攻击前方敌人,造成200%攻击的伤害,烈焰维持3秒"}, 6022:{uuid:6022,name:"大火球" ,for_hero:true,sp_name:"fire",path:"3039",quality:Quality.GREEN, TType:TType.Frontline,maxC:1, TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,CdType:2,AType:AType.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:90, - debuff:DebuffAttr.STUN,deV:20,deC:1,deR:100,in:1,ap:100,cd:5,hit:2,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"召唤大火球攻击前方所有敌人,造成300%攻击的伤害,有一定几率施加灼烧"}, + debuff:DebuffAttr.STUN,deV:20,deC:1,deR:100,in:1,ap:100,cd:5,hit:2,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"召唤大火球攻击前方所有敌人,造成300%攻击的伤害,有一定几率施加灼烧"}, 6023:{uuid:6023,name:"龙卷风",for_hero:true, sp_name:"bwind",path:"3065",quality:Quality.GREEN, TType:TType.Frontline,maxC:1, TGroup:TGroup.Enemy,SType:SType.damage,act:"max",DTType:DTType.single,CdType:2,AType:AType.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:90, - debuff:DebuffAttr.BACK,deV:0,deC:0,deR:100,in:3,ap:100,cd:5,hit:1,hited:1,shield:0,speed:360,hero:0,cost:10,info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,50%几率击退敌人"}, + debuff:DebuffAttr.BACK,deV:0,deC:0,deR:100,in:3,ap:100,cd:5,hit:1,hited:1,shield:0,heal:0,speed:360,hero:0,cost:10,info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,50%几率击退敌人"}, 6024:{uuid:6024,name:"寒冰箭",for_hero:true, sp_name:"arrow_blue",path:"3060",quality:Quality.GREEN, TType:TType.Frontline,maxC:1, TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,CdType:2,AType:AType.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:90, - debuff:DebuffAttr.FROST,deV:1,deC:0,deR:100,in:1,ap:100,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,20%几率冰冻敌人"}, + debuff:DebuffAttr.FROST,deV:1,deC:0,deR:100,in:1,ap:100,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,20%几率冰冻敌人"}, 6025:{uuid:6025,name:"烈焰射击",for_hero:false,sp_name:"arrow_yellow",path:"3014",quality:Quality.GREEN, TType:TType.Frontline,maxC:1, TGroup:TGroup.Enemy,SType:SType.damage,act:"atk",DTType:DTType.single,CdType:2,AType:AType.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:90, - debuff:DebuffAttr.STUN,deV:0,deC:0,deR:100,in:1,ap:100,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,20%几率眩晕敌人"}, + debuff:DebuffAttr.STUN,deV:0,deC:0,deR:100,in:1,ap:100,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,20%几率眩晕敌人"}, 6026:{uuid:6026,name:"火墙", for_hero:true, sp_name:"firewall",path:"3040",quality:Quality.BLUE, TType:TType.Frontline,maxC:1, TGroup:TGroup.Ally,SType:SType.damage,act:"max",DTType:DTType.range,CdType:2,AType:AType.fixedEnd,RType:RType.fixed,EType:EType.timeEnd,fname:"max",flash:false,with:90, - debuff:0,deV:0,deC:0,deR:100,in:10,ap:50,cd:5,hit:1,hited:1,shield:0,speed:720,hero:0,cost:10,info:"在最前方敌人位置,召唤一堵火墙,持续10秒,每秒造成50%攻击伤害"}, + debuff:0,deV:0,deC:0,deR:100,in:10,ap:50,cd:5,hit:1,hited:1,shield:0,heal:0,speed:720,hero:0,cost:10,info:"在最前方敌人位置,召唤一堵火墙,持续10秒,每秒造成50%攻击伤害"}, 6027:{uuid:6027,name:"冰刺",for_hero:true,sp_name:"icez",path:"3049",quality:Quality.BLUE, TType:TType.Frontline,maxC:1, TGroup:TGroup.Ally,SType:SType.damage,act:"max",DTType:DTType.range,CdType:2,AType:AType.fixedEnd,RType:RType.fixed,EType:EType.animationEnd,fname:"max",flash:false,with:90, - debuff:DebuffAttr.FROST,deV:0,deC:0,deR:100,in:1,ap:300,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"在最前方敌人位置,召唤冰刺攻击敌人,造成200%攻击的伤害,20%几率冰冻敌人"}, + debuff:DebuffAttr.FROST,deV:0,deC:0,deR:100,in:1,ap:300,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"在最前方敌人位置,召唤冰刺攻击敌人,造成200%攻击的伤害,20%几率冰冻敌人"}, 6028:{uuid:6028,name:"潮汐", for_hero:true, sp_name:"watert",path:"3070",quality:Quality.BLUE, TType:TType.Frontline,maxC:1, TGroup:TGroup.Ally,SType:SType.damage,act:"max",DTType:DTType.range,CdType:2,AType:AType.fixedEnd,RType:RType.fixed,EType:EType.animationEnd,fname:"max",flash:false,with:90, - debuff:DebuffAttr.BACK,deV:0,deC:0,deR:100,in:3,ap:100,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"在最前方敌人位置,召唤水柱攻击敌人,每秒造成100%攻击的伤害,50%几率击退敌人"}, + debuff:DebuffAttr.BACK,deV:0,deC:0,deR:100,in:3,ap:100,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"在最前方敌人位置,召唤水柱攻击敌人,每秒造成100%攻击的伤害,50%几率击退敌人"}, 6029:{uuid:6029,name:"陨石术",for_hero:true, sp_name:"fireys",path:"3123",quality:Quality.BLUE, TType:TType.Frontline,maxC:1, TGroup:TGroup.Ally,SType:SType.damage,act:"max",DTType:DTType.range,CdType:2,AType:AType.fixedEnd,RType:RType.fixed,EType:EType.animationEnd,fname:"max",flash:false,with:90, - debuff:0,deV:0,deC:0,deR:100,in:3,ap:500,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"在最前方敌人位置,召唤陨石攻击敌人,造成500%攻击的伤害"}, + debuff:0,deV:0,deC:0,deR:100,in:3,ap:500,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"在最前方敌人位置,召唤陨石攻击敌人,造成500%攻击的伤害"}, 6030:{uuid:6030,name:"冰墙", for_hero:false, sp_name:"icet",path:"3050",quality:Quality.GREEN, TType:TType.Frontline,maxC:1, TGroup:TGroup.Enemy,SType:SType.damage,act:"max",DTType:DTType.range,CdType:2,AType:AType.linear,RType:RType.linear,EType:EType.animationEnd,fname:"max",flash:false,with:90, - debuff:DebuffAttr.BACK,deV:0,deC:0,deR:100,in:1,ap:400,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"在最前方敌人位置,召唤冰墙攻击敌人,造成200%攻击的伤害,50%几率击退敌人"}, - - 6031:{uuid:6031,name:"召唤仆从",for_hero:true,sp_name:"zhaohuan",path:"3018",quality:Quality.PURPLE, TType:TType.Frontline,maxC:1, - TGroup:TGroup.Self,SType:SType.damage,act:"max",DTType:DTType.single,CdType:2,AType:AType.linear,RType:RType.linear,EType:EType.animationEnd,fname:"max_blue",flash:true,with:90, - debuff:0,deV:0,deC:0,deR:100,in:2,ap:70,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:5211,cost:10,info:"召唤一个与施法者等级相同的骷髅战士为我方而战"}, + debuff:DebuffAttr.BACK,deV:0,deC:0,deR:100,in:1,ap:400,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"在最前方敌人位置,召唤冰墙攻击敌人,造成200%攻击的伤害,50%几率击退敌人"}, + //召唤取消 + // 6031:{uuid:6031,name:"召唤骷髅",for_hero:true,sp_name:"zhaohuan",path:"3018",quality:Quality.GREEN, TType:TType.Frontline,maxC:1, + // TGroup:TGroup.Self,SType:SType.zhaohuan,act:"max",DTType:DTType.single,CdType:2,AType:AType.fixedStart,RType:RType.fixed,EType:EType.animationEnd,fname:"max_blue",flash:true,with:90, + // debuff:0,deV:0,deC:0,deR:100,in:0.8,ap:70,cd:60,hit:1,hited:1,shield:0,heal:0,speed:720,hero:5221,cost:10,info:"召唤一个骷髅战士为我方而战"}, 6032:{uuid:6032,name:"陨石风暴",for_hero:true, sp_name:"fireys",path:"3101",quality:Quality.PURPLE, TType:TType.Frontline,maxC:5, TGroup:TGroup.Ally,SType:SType.damage,act:"max",DTType:DTType.range,CdType:2,AType:AType.fixedEnd,RType:RType.fixed,EType:EType.animationEnd,fname:"max",flash:false,with:90, - debuff:0,deV:0,deC:0,deR:100,in:3,ap:500,cd:5,hit:1,hited:0.3,shield:0,speed:720,hero:0,cost:10,info:"在最前方敌人位置,召唤陨石攻击敌人,造成500%攻击的伤害"}, + debuff:0,deV:0,deC:0,deR:100,in:3,ap:500,cd:5,hit:1,hited:0.3,shield:0,heal:0,speed:720,hero:0,cost:10,info:"在最前方敌人位置,召唤陨石攻击敌人,造成500%攻击的伤害"}, 6033:{uuid:6033,name:"龙卷风爆",for_hero:true, sp_name:"bwind",path:"3069",quality:Quality.PURPLE, TType:TType.Frontline,maxC:5, - TGroup:TGroup.Ally,SType:SType.damage,act:"max",DTType:DTType.single,CdType:2,AType:AType.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:90, - debuff:DebuffAttr.BACK,deV:0,deC:0,deR:100,in:3,ap:100,cd:5,hit:1,hited:1,shield:0,speed:360,hero:0,cost:10,info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,50%几率击退敌人"}, + TGroup:TGroup.Ally,SType:SType.damage,act:"max",DTType:DTType.range,CdType:2,AType:AType.linear,RType:RType.linear,EType:EType.collision,fname:"max",flash:false,with:90, + debuff:DebuffAttr.BACK,deV:0,deC:0,deR:100,in:3,ap:100,cd:5,hit:1,hited:1,shield:0,heal:0,speed:360,hero:0,cost:10,info:"召唤大火球攻击前方所有敌人,造成200%攻击的伤害,50%几率击退敌人"}, }; \ No newline at end of file diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index db3e3e81..ae1b435c 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -195,6 +195,7 @@ export class HeroViewComp extends CCComp { add_shield(shield:number){ this.shield =shield + if(this.shield>6) this.shield=6 if(this.shield>0) this.BUFFCOMP.show_shield(true) } // add_cd(cd: number){ @@ -255,19 +256,30 @@ export class HeroViewComp extends CCComp { add_hp(hp: number = 0,is_num:boolean=true) { this.BUFFCOMP.heathed(); + let real_hp=0 + let hp_max=Math.floor(this.hp_max*(100+this.buff_hp)/100) + let lost_hp=hp_max-this.hp if(is_num){ - this.hp+=Math.floor(hp); + if(lost_hp > hp){ + real_hp=Math.floor(hp); + }else{ + real_hp=lost_hp; + } }else{ - this.hp+=Math.floor(hp/100*this.hp_max); + if(lost_hp > hp/100*hp_max){ + real_hp=Math.floor(hp/100*hp_max); + }else{ + real_hp=lost_hp; + } } - if(this.hp > this.hp_max){ - this.hp = this.hp_max; + if(real_hp > 0){ + this.hp+=real_hp; + this.BUFFCOMP.tooltip(TooltipTypes.health,real_hp.toFixed(0)); } - this.BUFFCOMP.tooltip(TooltipTypes.health,hp.toFixed(0)); this.BUFFCOMP.vmdata_update(true) } - + /** 静止时间 */ in_stop (dt: number) { if(this.stop_cd > 0){ diff --git a/assets/script/game/hero/SkillConComp.ts b/assets/script/game/hero/SkillConComp.ts index 5734e0eb..ea125f43 100644 --- a/assets/script/game/hero/SkillConComp.ts +++ b/assets/script/game/hero/SkillConComp.ts @@ -87,7 +87,7 @@ export class SkillConComp extends CCComp { target = this.node.position break case TGroup.Team: //所有友方 - + target = this.selectTeamFront() break case TGroup.All: //所有单位 @@ -164,7 +164,22 @@ export class SkillConComp extends CCComp { pos=v3(this.get_front(entities),0) return pos } - + private selectTeamFront(){ + let pos=this.node.position + let entities=null + if(this.HeroView.fac==FacSet.HERO){ + entities=ecs.query(ecs.allOf(HeroModelComp)) + }else{ + entities=ecs.query(ecs.allOf(MonModelComp)) + } + if(entities.length==0){ + return pos + } + let keyPos = this.HeroView.fac==FacSet.HERO ? + Math.max(...entities.map(e => e.get(HeroViewComp).node.position.x)) : + Math.min(...entities.map(e => e.get(HeroViewComp).node.position.x)); + return v3(keyPos,20) + } private selectAllyTargets( ): Vec3 { // 敌方最前排是x坐标最大的+50，我方最前排是x坐标最小的+50,若目标不存在,敌人 取320/2,我方取-320/2 let kp=0 diff --git a/assets/script/game/map/MissionHeroComp.ts b/assets/script/game/map/MissionHeroComp.ts index 4b2a44ae..cfd99fb0 100644 --- a/assets/script/game/map/MissionHeroComp.ts +++ b/assets/script/game/map/MissionHeroComp.ts @@ -25,6 +25,7 @@ export class MissionHeroCompComp extends CCComp { this.on(GameEvent.UseHeroCard,this.call_hero,this) this.on(GameEvent.ChangeATK_EQUIP_SPECIAL_ATTR,this.change_equip_qpecial_attr,this) this.on(GameEvent.FightReady,this.fight_ready,this) + this.on(GameEvent.Zhaohuan,this.zhao_huan,this) } start() { @@ -47,7 +48,10 @@ export class MissionHeroCompComp extends CCComp { change_equip_qpecial_attr(e:GameEvent,data:any){ } - + private zhao_huan(event: string, args: any){ + console.log("[MissionHeroComp]:zhaohuan",args) + this.addHero(args.uuid,false,true) + } up_friend_alive_cd(less:number){ } @@ -135,11 +139,14 @@ export class MissionHeroCompComp extends CCComp { } /** 添加英雄 */ - private addHero(uuid:number=1001,is_master:boolean=false) { + private addHero(uuid:number=1001,is_master:boolean=false,is_zhaohuan:boolean=false) { let hero_pos=1 if(is_master){ hero_pos=0 } + if(is_zhaohuan){ + hero_pos=2 + } let info:any=this.get_info_and_remove(hero_pos,uuid) // let info:any={ap:0,hp:0,lv:0} let hero = ecs.getEntity(Hero); diff --git a/assets/script/game/skills/Skill.ts b/assets/script/game/skills/Skill.ts index 4b369727..98f878bb 100644 --- a/assets/script/game/skills/Skill.ts +++ b/assets/script/game/skills/Skill.ts @@ -88,6 +88,8 @@ export class Skill extends ecs.Entity { SComp.caster_crit_d = ap_data.crit_d SComp.puncture = ap_data.puncture SComp.puncture_damage = ap_data.puncture_damage + SComp.heal = config.heal + SComp.shield = config.shield // 设置技能组件属性 Object.assign(SComp, { s_uuid: uuid, @@ -101,7 +103,7 @@ export class Skill extends ecs.Entity { group: caster.box_group, fac: caster.fac, scale: caster.scale, - animName: config.animName + animName: config.animName, }); this.add(SComp); diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts index 7640c566..4d1b0c63 100644 --- a/assets/script/game/skills/SkillCom.ts +++ b/assets/script/game/skills/SkillCom.ts @@ -4,7 +4,7 @@ import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/modu import { smc } from "../common/SingletonModuleComp"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { GameEvent } from "../common/config/GameEvent"; -import { AType, EType, RType, SkillSet } from "../common/config/SkillSet"; +import { AType, DTType, EType, RType, SkillSet, SType, TGroup } from "../common/config/SkillSet"; import { BoxSet, FacSet } from "../common/config/BoxSet"; import { HeroFac, HeroSet } from "../common/config/heroSet"; import { HeroViewComp } from "../hero/HeroViewComp"; @@ -42,6 +42,8 @@ export class SkillCom extends CCComp { distance_x:number=0; distance_y:number=0; ap:number=0; + heal:number=0; + shield:number=0; FIGHTCON:FightConComp=null; run_time:number=0; hited_time:number=0; @@ -110,6 +112,13 @@ export class SkillCom extends CCComp { } } break; + case AType.fixedStart: + 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) + break; } @@ -150,7 +159,7 @@ export class SkillCom extends CCComp { target.add_debuff(debuff.debuff,dev,deC,deR) } this.hit_count++ - if(this.hit_count>=(SkillSet[this.s_uuid].hit+this.puncture)&&(this.EType!=EType.animationEnd&&this.EType!=EType.timeEnd)) this.is_destroy=true // 技能命中次数 + if(this.hit_count>=(SkillSet[this.s_uuid].hit+this.puncture)&&(SkillSet[this.s_uuid].DTType!=DTType.range)) this.is_destroy=true // 技能命中次数 } onBeginContact (seCol: Collider2D, oCol: Collider2D) { @@ -179,7 +188,7 @@ export class SkillCom extends CCComp { * 执行2段位移：先升高，然后移到目的地 */ private executeTwoStageMovement() { - const totalDuration = SkillSet[this.s_uuid].in; + const totalDuration = SkillSet[this.s_uuid].in-0.1 const firstStageDuration = totalDuration * 0.4; // 第一段占40%时间 const secondStageDuration = totalDuration * 0.6; // 第二段占60%时间 @@ -204,9 +213,25 @@ export class SkillCom extends CCComp { }) .start(); } - do_buff(){ + private do_buff(){ console.log("[SkillCom]:do_buff") + let teams=ecs.query(ecs.allOf(HeroModelComp)) + if(this.fac==FacSet.MON) teams=ecs.query(ecs.allOf(MonModelComp)) + if(SkillSet[this.s_uuid].TGroup==TGroup.Team||SkillSet[this.s_uuid].TGroup==TGroup.Self) { + teams.forEach(entity => { + let view=entity.get(HeroViewComp) + if(view.node.position.x==this.targetPos.x){ + if(SkillSet[this.s_uuid].SType==SType.heal){ + view.add_hp(this.heal,false) + } + if(SkillSet[this.s_uuid].SType==SType.shield){ + view.add_shield(this.shield) + } + } + }); + } } + private startLinearMove(dt: number) { if (!this.speed || this.is_destroy) return; if(this.s_uuid == 6005){ @@ -243,7 +268,7 @@ export class SkillCom extends CCComp { } //范围伤害 this.hited_time+=deltaTime - if(this.hited_time>config.hited&&(config.EType==EType.animationEnd||config.EType==EType.timeEnd)){ + if(this.hited_time>config.hited&&(SkillSet[this.s_uuid].DTType==DTType.range)){ this.hited_time=0 this.range_damage() }