diff --git a/assets/resources/game/heros/hero.prefab b/assets/resources/game/heros/hero.prefab index 40d85b69..1787828e 100644 --- a/assets/resources/game/heros/hero.prefab +++ b/assets/resources/game/heros/hero.prefab @@ -79,8 +79,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -1907,6 +1907,10 @@ "__prefab": { "__id__": 86 }, + "hitFlashMaterial": { + "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264", + "__expectedType__": "cc.Material" + }, "_id": "" }, { @@ -1933,13 +1937,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 0.1, - "y": 34.3 + "x": 2.6, + "y": 32.5 }, "_size": { "__type__": "cc.Size", - "width": 13.8, - "height": 75.1 + "width": 24.5, + "height": 75.8 }, "_id": "" }, diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index feaabc03..bb7b49c0 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -1261,7 +1261,7 @@ "propertyPath": [ "_active" ], - "value": true + "value": false }, { "__type__": "CCPropertyOverrideInfo", diff --git a/assets/resources/game/skills/atk.meta b/assets/resources/game/skills/atk.meta new file mode 100644 index 00000000..bb0b42ca --- /dev/null +++ b/assets/resources/game/skills/atk.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "15884e0d-4a3e-4bd3-9338-dd4a78fd79a2", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/atk.prefab b/assets/resources/game/skills/atk.prefab new file mode 100644 index 00000000..311533f2 --- /dev/null +++ b/assets/resources/game/skills/atk.prefab @@ -0,0 +1,242 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "atk", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "atk", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 2 + }, + { + "__id__": 4 + }, + { + "__id__": 6 + }, + { + "__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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 3 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 80, + "height": 96 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "deG52Z3NdHtYuvrYleDnLK" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 5 + }, + "enabledContactListener": true, + "bullet": false, + "awakeOnLoad": true, + "_group": 16, + "_type": 2, + "_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": "774JH1Xt1GfLXpUa0g7EQP" + }, + { + "__type__": "cc.BoxCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 7 + }, + "tag": 0, + "_group": 16, + "_density": 1, + "_sensor": false, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 4.2, + "y": 1.7 + }, + "_size": { + "__type__": "cc.Size", + "width": 90.5, + "height": 92.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d6FlnvRK1P35VdKduwosNP" + }, + { + "__type__": "45646oIyIdA24W+0c5rdELD", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4bC8P0yqtCQ56KoL1NqAl7" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@41d52", + "__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": "76ytJ6bcRJvagyxOFdZddO" + }, + { + "__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/atk.prefab.meta b/assets/resources/game/skills/atk.prefab.meta new file mode 100644 index 00000000..47e74f8f --- /dev/null +++ b/assets/resources/game/skills/atk.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "e19cbf15-33ee-48ae-89f9-a5f8323cdf66", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "atk" + } +} diff --git a/assets/resources/game/skills/atk/1902112.atlas b/assets/resources/game/skills/atk/1902112.atlas new file mode 100644 index 00000000..da025efa --- /dev/null +++ b/assets/resources/game/skills/atk/1902112.atlas @@ -0,0 +1,41 @@ + +1902112.png +size: 254,52 +format: RGBA8888 +filter: Linear,Linear +repeat: none +zhaozi_dg_00000 + rotate: true + xy: 187, 6 + size: 44, 41 + orig: 50, 48 + offset: 3, 3 + index: -1 +zhaozi_dg_00001 + rotate: false + xy: 71, 11 + size: 65, 39 + orig: 71, 47 + offset: 2, 3 + index: -1 +zhaozi_dg_00003 + rotate: false + xy: 2, 2 + size: 67, 48 + orig: 76, 54 + offset: 3, 3 + index: -1 +zhaozi_dg_00004 + rotate: true + xy: 138, 2 + size: 48, 47 + orig: 53, 55 + offset: 3, 5 + index: -1 +zhaozi_dg_00005 + rotate: false + xy: 230, 4 + size: 22, 46 + orig: 26, 50 + offset: 3, 0 + index: -1 diff --git a/assets/resources/game/skills/atk/1902112.atlas.meta b/assets/resources/game/skills/atk/1902112.atlas.meta new file mode 100644 index 00000000..21c22e98 --- /dev/null +++ b/assets/resources/game/skills/atk/1902112.atlas.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.1", + "importer": "*", + "imported": true, + "uuid": "7ab419d0-1103-43a2-9b41-fcc2bbf6a0d9", + "files": [ + ".atlas", + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/atk/1902112.json b/assets/resources/game/skills/atk/1902112.json new file mode 100644 index 00000000..74d106fe --- /dev/null +++ b/assets/resources/game/skills/atk/1902112.json @@ -0,0 +1,155 @@ +{ +"skeleton": { "hash": "RzuY2KsGY/h8RnqhMkr1C6zecD0", "spine": "3.8.99", "images": "./0/", "audio": "" }, +"bones": [ + { "name": "root" }, + { "name": "baodian", "parent": "root" }, + { "name": "hitzhaozi_dg_a1", "parent": "baodian" }, + { "name": "hitzhaozi_dg_b1", "parent": "hitzhaozi_dg_a1" }, + { "name": "hitzhaozi_dg_a2", "parent": "baodian" }, + { "name": "hitzhaozi_dg_b2", "parent": "hitzhaozi_dg_a2" }, + { "name": "hitzhaozi_dg_a3", "parent": "baodian" }, + { "name": "hitzhaozi_dg_b3", "parent": "hitzhaozi_dg_a3" } +], +"slots": [ + { "name": "hitzhaozi_dg_a3", "bone": "hitzhaozi_dg_b3" }, + { "name": "hitzhaozi_dg_a1", "bone": "hitzhaozi_dg_b1" }, + { "name": "hitzhaozi_dg_a2", "bone": "hitzhaozi_dg_b2" } +], +"skins": [ + { + "name": "default", + "attachments": { + "hitzhaozi_dg_a1": { + "zhaozi_dg_00000": { "x": 8.44, "y": -9.34, "width": 50, "height": 48 }, + "zhaozi_dg_00001": { "x": 2.7, "y": -9.94, "width": 71, "height": 47 }, + "zhaozi_dg_00003": { "x": -1.18, "y": -7.92, "width": 76, "height": 54 }, + "zhaozi_dg_00004": { "x": -7.92, "y": -6.1, "width": 53, "height": 55 }, + "zhaozi_dg_00005": { "x": -14.69, "y": -2.06, "width": 26, "height": 50 } + }, + "hitzhaozi_dg_a2": { + "zhaozi_dg_00000": { "x": 8.44, "y": -9.34, "width": 50, "height": 48 }, + "zhaozi_dg_00001": { "x": 2.7, "y": -9.94, "width": 71, "height": 47 }, + "zhaozi_dg_00003": { "x": -1.18, "y": -7.92, "width": 76, "height": 54 }, + "zhaozi_dg_00004": { "x": -7.92, "y": -6.1, "width": 53, "height": 55 }, + "zhaozi_dg_00005": { "x": -14.69, "y": -2.06, "width": 26, "height": 50 } + }, + "hitzhaozi_dg_a3": { + "zhaozi_dg_00000": { "x": 8.44, "y": -9.34, "width": 50, "height": 48 }, + "zhaozi_dg_00001": { "x": 2.7, "y": -9.94, "width": 71, "height": 47 }, + "zhaozi_dg_00003": { "x": -1.18, "y": -7.92, "width": 76, "height": 54 }, + "zhaozi_dg_00004": { "x": -7.92, "y": -6.1, "width": 53, "height": 55 }, + "zhaozi_dg_00005": { "x": -14.69, "y": -2.06, "width": 26, "height": 50 } + } + } + } +], +"events": { + "OnCreateMagicHarm": {}, + "Skill_Complete": {} +}, +"animations": { + "animation": { + "slots": { + "hitzhaozi_dg_a1": { + "attachment": [ + { "time": 0.1667, "name": "zhaozi_dg_00000" }, + { "time": 0.2, "name": "zhaozi_dg_00001" }, + { "time": 0.2667, "name": "zhaozi_dg_00003" }, + { "time": 0.3, "name": "zhaozi_dg_00004" }, + { "time": 0.3667, "name": "zhaozi_dg_00005" }, + { "time": 0.4333, "name": null } + ] + }, + "hitzhaozi_dg_a2": { + "attachment": [ + { "time": 0.1667, "name": "zhaozi_dg_00000" }, + { "time": 0.2, "name": "zhaozi_dg_00001" }, + { "time": 0.2667, "name": "zhaozi_dg_00003" }, + { "time": 0.3, "name": "zhaozi_dg_00004" }, + { "time": 0.3667, "name": "zhaozi_dg_00005" }, + { "time": 0.4333, "name": null } + ] + }, + "hitzhaozi_dg_a3": { + "attachment": [ + { "time": 0.1667, "name": "zhaozi_dg_00000" }, + { "time": 0.2, "name": "zhaozi_dg_00001" }, + { "time": 0.2667, "name": "zhaozi_dg_00003" }, + { "time": 0.3, "name": "zhaozi_dg_00004" }, + { "time": 0.3667, "name": "zhaozi_dg_00005" }, + { "time": 0.4333, "name": null } + ] + } + }, + "bones": { + "hitzhaozi_dg_b1": { + "rotate": [ + { "curve": "stepped" }, + { "time": 0.1667, "angle": 39.65 }, + { "time": 0.2, "angle": -25.3 } + ] + }, + "hitzhaozi_dg_b2": { + "rotate": [ + { "curve": "stepped" }, + { "time": 0.1667, "angle": 39.65 }, + { "time": 0.2, "angle": -25.3 } + ] + }, + "hitzhaozi_dg_b3": { + "rotate": [ + { "curve": "stepped" }, + { "time": 0.1667, "angle": 39.65 }, + { "time": 0.2, "angle": -25.3 } + ] + }, + "hitzhaozi_dg_a1": { + "translate": [ + { "curve": "stepped" }, + { "time": 0.1667, "x": 3.98, "y": 38.73 } + ], + "scale": [ + { "curve": "stepped" }, + { "time": 0.1667, "x": 2.4, "y": 2.4 } + ], + "shear": [ + { "curve": "stepped" }, + { "time": 0.1667, "x": -179.82, "y": -154.19 } + ] + }, + "hitzhaozi_dg_a2": { + "translate": [ + { "curve": "stepped" }, + { "time": 0.1667, "x": 2.39, "y": 26.84 } + ], + "scale": [ + { "curve": "stepped" }, + { "time": 0.1667, "x": 2, "y": 2 } + ], + "shear": [ + { "curve": "stepped" }, + { "time": 0.1667, "x": -175.44, "y": -141.53 } + ] + }, + "hitzhaozi_dg_a3": { + "translate": [ + { "curve": "stepped" }, + { "time": 0.1667, "x": 18.68, "y": 46.94 } + ], + "scale": [ + { "curve": "stepped" }, + { "time": 0.1667, "x": 2, "y": 2 } + ], + "shear": [ + { "curve": "stepped" }, + { "time": 0.1667, "x": 176.79, "y": -165.1 } + ] + } + }, + "events": [ + { "time": 0.2333, "name": "OnCreateMagicHarm" }, + { "time": 0.8, "name": "Skill_Complete" } + ] + } +} +} \ No newline at end of file diff --git a/assets/resources/game/skills/atk/1902112.json.meta b/assets/resources/game/skills/atk/1902112.json.meta new file mode 100644 index 00000000..e490795e --- /dev/null +++ b/assets/resources/game/skills/atk/1902112.json.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.2.6", + "importer": "spine-data", + "imported": true, + "uuid": "781779c5-9961-43c5-87b7-9c76157a87dd", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/atk/1902112.png b/assets/resources/game/skills/atk/1902112.png new file mode 100644 index 00000000..0134658c Binary files /dev/null and b/assets/resources/game/skills/atk/1902112.png differ diff --git a/assets/resources/game/skills/atk/1902112.png.meta b/assets/resources/game/skills/atk/1902112.png.meta new file mode 100644 index 00000000..58832d97 --- /dev/null +++ b/assets/resources/game/skills/atk/1902112.png.meta @@ -0,0 +1,42 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "5fd46aaf-0281-4b00-baae-151d72d42084", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "5fd46aaf-0281-4b00-baae-151d72d42084@6c48a", + "displayName": "1902112", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "5fd46aaf-0281-4b00-baae-151d72d42084", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "texture", + "fixAlphaTransparencyArtifacts": false, + "redirect": "5fd46aaf-0281-4b00-baae-151d72d42084@6c48a" + } +} diff --git a/assets/resources/game/skills/atk/atk.anim b/assets/resources/game/skills/atk/atk.anim new file mode 100644 index 00000000..b951581d --- /dev/null +++ b/assets/resources/game/skills/atk/atk.anim @@ -0,0 +1,454 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "atk", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [ + { + "key": "1724256974260", + "name": "particle-system", + "type": "particle-system" + }, + { + "key": "1724256980173", + "name": "animation-clip", + "type": "animation-clip" + } + ] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.4583333333333333, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + }, + { + "__id__": 6 + }, + { + "__id__": 16 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 26 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channel": { + "__id__": 4 + } + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 3 + }, + "spriteFrame" + ] + }, + { + "__type__": "cc.animation.ComponentPath", + "component": "cc.Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 5 + } + }, + { + "__type__": "cc.ObjectCurve", + "_times": [ + 0, + 0.08333333333333333, + 0.16666666666666666, + 0.25, + 0.3333333333333333, + 0.4166666666666667 + ], + "_values": [ + { + "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@869e3", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@41d52", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@b3fb8", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@08fc9", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@c3b0a", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@0fb0c", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.animation.VectorTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 7 + }, + "proxy": null + }, + "_channels": [ + { + "__id__": 8 + }, + { + "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + } + ], + "_nComponents": 3 + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + "eulerAngles" + ] + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 9 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.4166666567325592 + ], + "_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__": 11 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.4166666567325592 + ], + "_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__": 13 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.4166666567325592 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": -20, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": -60, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 15 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.VectorTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 17 + }, + "proxy": null + }, + "_channels": [ + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 + }, + { + "__id__": 24 + } + ], + "_nComponents": 3 + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + "position" + ] + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 19 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.4166666567325592 + ], + "_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__": 21 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.4166666567325592 + ], + "_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": -60, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 23 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.4166666567325592 + ], + "_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__": 25 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/atk/atk.anim.meta b/assets/resources/game/skills/atk/atk.anim.meta new file mode 100644 index 00000000..025014ac --- /dev/null +++ b/assets/resources/game/skills/atk/atk.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "2637ec46-d70c-465f-aeac-e2af494b681e", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "atk" + } +} diff --git a/assets/resources/game/skills/atk/atk.plist b/assets/resources/game/skills/atk/atk.plist new file mode 100644 index 00000000..5a483a5d --- /dev/null +++ b/assets/resources/game/skills/atk/atk.plist @@ -0,0 +1,116 @@ + + + + + frames + + atk1_05.png + + aliases + + spriteOffset + {-8,12} + spriteSize + {185,97} + spriteSourceSize + {213,177} + textureRect + {{1,150},{185,97}} + textureRotated + + + atk1_06.png + + aliases + + spriteOffset + {0,0} + spriteSize + {80,96} + spriteSourceSize + {96,96} + textureRect + {{317,146},{80,96}} + textureRotated + + + atk1_07.png + + aliases + + spriteOffset + {1,-8} + spriteSize + {195,147} + spriteSourceSize + {213,177} + textureRect + {{1,1},{195,147}} + textureRotated + + + atk1_08.png + + aliases + + spriteOffset + {16,-10} + spriteSize + {139,143} + spriteSourceSize + {213,177} + textureRect + {{198,1},{139,143}} + textureRotated + + + atk1_09.png + + aliases + + spriteOffset + {16,-10} + spriteSize + {139,143} + spriteSourceSize + {213,177} + textureRect + {{198,1},{139,143}} + textureRotated + + + atk1_10.png + + aliases + + spriteOffset + {30,-19} + spriteSize + {77,117} + spriteSourceSize + {213,177} + textureRect + {{198,146},{77,117}} + textureRotated + + + + metadata + + format + 3 + pixelFormat + RGBA8888 + premultiplyAlpha + + realTextureFileName + atk.png + size + {398,248} + smartupdate + $TexturePacker:SmartUpdate:3e0511483edf68981a91ef9247b7d6e4:8194b129ee2d5e6800b1df21a2ee7d85:161bb8e8e5d13d624c660b9bcb3183a7$ + textureFileName + atk.png + + + diff --git a/assets/resources/game/skills/atk/atk.plist.meta b/assets/resources/game/skills/atk/atk.plist.meta new file mode 100644 index 00000000..50af08fc --- /dev/null +++ b/assets/resources/game/skills/atk/atk.plist.meta @@ -0,0 +1,293 @@ +{ + "ver": "1.0.8", + "importer": "sprite-atlas", + "imported": true, + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a", + "files": [ + ".json" + ], + "subMetas": { + "869e3": { + "importer": "sprite-frame", + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@869e3", + "displayName": "", + "id": "869e3", + "name": "atk1_05", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -8, + "offsetY": 12, + "trimX": 1, + "trimY": 150, + "width": 185, + "height": 97, + "rawWidth": 213, + "rawHeight": 177, + "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": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", + "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "41d52": { + "importer": "sprite-frame", + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@41d52", + "displayName": "", + "id": "41d52", + "name": "atk1_06", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 317, + "trimY": 146, + "width": 80, + "height": 96, + "rawWidth": 96, + "rawHeight": 96, + "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": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", + "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "b3fb8": { + "importer": "sprite-frame", + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@b3fb8", + "displayName": "", + "id": "b3fb8", + "name": "atk1_07", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 1, + "offsetY": -8, + "trimX": 1, + "trimY": 1, + "width": 195, + "height": 147, + "rawWidth": 213, + "rawHeight": 177, + "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": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", + "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "08fc9": { + "importer": "sprite-frame", + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@08fc9", + "displayName": "", + "id": "08fc9", + "name": "atk1_08", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 16, + "offsetY": -10, + "trimX": 198, + "trimY": 1, + "width": 139, + "height": 143, + "rawWidth": 213, + "rawHeight": 177, + "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": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", + "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "c3b0a": { + "importer": "sprite-frame", + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@c3b0a", + "displayName": "", + "id": "c3b0a", + "name": "atk1_09", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 16, + "offsetY": -10, + "trimX": 198, + "trimY": 1, + "width": 139, + "height": 143, + "rawWidth": 213, + "rawHeight": 177, + "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": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", + "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "0fb0c": { + "importer": "sprite-frame", + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@0fb0c", + "displayName": "", + "id": "0fb0c", + "name": "atk1_10", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 30, + "offsetY": -19, + "trimX": 198, + "trimY": 146, + "width": 77, + "height": 117, + "rawWidth": 213, + "rawHeight": 177, + "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": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", + "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "atlasTextureName": "atk.png", + "format": 3, + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a", + "textureUuid": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a" + } +} diff --git a/assets/resources/game/skills/atk/atk.png b/assets/resources/game/skills/atk/atk.png new file mode 100644 index 00000000..da5e2a50 Binary files /dev/null and b/assets/resources/game/skills/atk/atk.png differ diff --git a/assets/resources/game/skills/atk/atk.png.meta b/assets/resources/game/skills/atk/atk.png.meta new file mode 100644 index 00000000..5d371edc --- /dev/null +++ b/assets/resources/game/skills/atk/atk.png.meta @@ -0,0 +1,42 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "080612ff-048b-45e7-b7d1-383a7fa73063", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", + "displayName": "atk", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "080612ff-048b-45e7-b7d1-383a7fa73063", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "texture", + "fixAlphaTransparencyArtifacts": false, + "redirect": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a" + } +} diff --git a/assets/resources/game/skills/atk/longzhua.atlas b/assets/resources/game/skills/atk/longzhua.atlas new file mode 100644 index 00000000..4558f417 --- /dev/null +++ b/assets/resources/game/skills/atk/longzhua.atlas @@ -0,0 +1,132 @@ + +longzhua.png +size: 425,789 +format: RGBA8888 +filter: Linear,Linear +repeat: none +lz0001 + rotate: false + xy: 291, 178 + size: 112, 51 + orig: 400, 104 + offset: 5, 52 + index: -1 +lz0002 + rotate: false + xy: 2, 164 + size: 268, 61 + orig: 400, 104 + offset: 21, 32 + index: -1 +lz0003 + rotate: true + xy: 330, 286 + size: 314, 88 + orig: 400, 104 + offset: 7, 13 + index: -1 +lz0004 + rotate: false + xy: 2, 465 + size: 317, 86 + orig: 400, 104 + offset: 23, 5 + index: -1 +lz0005 + rotate: false + xy: 2, 708 + size: 347, 79 + orig: 400, 104 + offset: 16, 6 + index: -1 +lz0006 + rotate: false + xy: 2, 630 + size: 338, 76 + orig: 400, 104 + offset: 32, 5 + index: -1 +lz0007 + rotate: false + xy: 2, 553 + size: 326, 75 + orig: 400, 104 + offset: 55, 6 + index: -1 +lz0008 + rotate: false + xy: 2, 386 + size: 314, 77 + orig: 400, 104 + offset: 69, 6 + index: -1 +lz0009 + rotate: false + xy: 2, 307 + size: 301, 77 + orig: 400, 104 + offset: 89, 7 + index: -1 +lz0010 + rotate: false + xy: 2, 227 + size: 287, 78 + orig: 400, 104 + offset: 103, 7 + index: -1 +lz0011 + rotate: false + xy: 2, 87 + size: 225, 75 + orig: 400, 104 + offset: 165, 10 + index: -1 +lz0012 + rotate: true + xy: 351, 602 + size: 185, 72 + orig: 400, 104 + offset: 205, 14 + index: -1 +lz0013 + rotate: false + xy: 229, 30 + size: 190, 74 + orig: 400, 104 + offset: 205, 14 + index: -1 +lz0014 + rotate: false + xy: 2, 16 + size: 148, 69 + orig: 400, 104 + offset: 247, 19 + index: -1 +lz0015 + rotate: false + xy: 272, 106 + size: 151, 70 + orig: 400, 104 + offset: 247, 19 + index: -1 +lz0016 + rotate: true + xy: 152, 2 + size: 83, 52 + orig: 400, 104 + offset: 310, 35 + index: -1 +lz0017 + rotate: false + xy: 325, 231 + size: 86, 53 + orig: 400, 104 + offset: 310, 35 + index: -1 +lz0018 + rotate: true + xy: 291, 252 + size: 53, 32 + orig: 400, 104 + offset: 319, 40 + index: -1 diff --git a/assets/resources/game/skills/atk/longzhua.atlas.meta b/assets/resources/game/skills/atk/longzhua.atlas.meta new file mode 100644 index 00000000..a4ce7995 --- /dev/null +++ b/assets/resources/game/skills/atk/longzhua.atlas.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.1", + "importer": "*", + "imported": true, + "uuid": "4260781d-f8c0-4c0a-b903-fde132f31a95", + "files": [ + ".atlas", + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/atk/longzhua.json b/assets/resources/game/skills/atk/longzhua.json new file mode 100644 index 00000000..86efde80 --- /dev/null +++ b/assets/resources/game/skills/atk/longzhua.json @@ -0,0 +1,89 @@ +{ +"skeleton": { + "hash": "50ApuVV80PrEQ4k+NPuD0/5Uy2o", + "spine": "3.8.99", + "x": -201.16, + "y": -224.35, + "width": 760.53, + "height": 954.29, + "images": "./0/", + "audio": "G:/游戏素材收集/英灵召唤师/effect/skilleffect/eff92-longzhua" +}, +"bones": [ + { "name": "root", "y": 106.65 }, + { + "name": "down2", + "parent": "root", + "length": 477.07, + "rotation": 55.44, + "x": 179.11, + "y": 146.15, + "scaleX": -2.45, + "scaleY": 2.45 + } +], +"slots": [ + { "name": "zj2", "bone": "down2", "attachment": "lz0009", "blend": "additive" } +], +"skins": [ + { + "name": "default", + "attachments": { + "zj2": { + "lz0001": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0002": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0003": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0004": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0005": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0006": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0007": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0008": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0009": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0010": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0011": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0012": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0013": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0014": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0015": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0016": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0017": { "rotation": -0.45, "width": 400, "height": 104 }, + "lz0018": { "rotation": -0.45, "width": 400, "height": 104 } + } + } + } +], +"animations": { + "down": { + "slots": { + "zj2": { + "color": [ + { "color": "ffffff00" }, + { "time": 0.0333, "color": "ffffffff", "curve": "stepped" }, + { "time": 0.6, "color": "ffffffff" }, + { "time": 0.6333, "color": "ffffff00" } + ], + "attachment": [ + { "name": "lz0001" }, + { "time": 0.0667, "name": "lz0002" }, + { "time": 0.1, "name": "lz0003" }, + { "time": 0.1333, "name": "lz0004" }, + { "time": 0.1667, "name": "lz0005" }, + { "time": 0.2, "name": "lz0006" }, + { "time": 0.2333, "name": "lz0007" }, + { "time": 0.2667, "name": "lz0008" }, + { "time": 0.3, "name": "lz0009" }, + { "time": 0.3333, "name": "lz0010" }, + { "time": 0.3667, "name": "lz0011" }, + { "time": 0.4, "name": "lz0012" }, + { "time": 0.4333, "name": "lz0013" }, + { "time": 0.4667, "name": "lz0014" }, + { "time": 0.5, "name": "lz0015" }, + { "time": 0.5333, "name": "lz0016" }, + { "time": 0.5667, "name": "lz0017" }, + { "time": 0.6, "name": "lz0018" } + ] + } + } + } +} +} \ No newline at end of file diff --git a/assets/resources/game/skills/atk/longzhua.json.meta b/assets/resources/game/skills/atk/longzhua.json.meta new file mode 100644 index 00000000..56abbc57 --- /dev/null +++ b/assets/resources/game/skills/atk/longzhua.json.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.2.6", + "importer": "spine-data", + "imported": true, + "uuid": "9233af8c-254c-4f70-b157-f9c1c80ba17a", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/atk/longzhua.png b/assets/resources/game/skills/atk/longzhua.png new file mode 100644 index 00000000..d782117e Binary files /dev/null and b/assets/resources/game/skills/atk/longzhua.png differ diff --git a/assets/resources/game/skills/atk/longzhua.png.meta b/assets/resources/game/skills/atk/longzhua.png.meta new file mode 100644 index 00000000..d6d20758 --- /dev/null +++ b/assets/resources/game/skills/atk/longzhua.png.meta @@ -0,0 +1,42 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "b5287bf0-4614-4034-bd0a-4c7ed9334ade", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "b5287bf0-4614-4034-bd0a-4c7ed9334ade@6c48a", + "displayName": "longzhua", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "b5287bf0-4614-4034-bd0a-4c7ed9334ade", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "texture", + "fixAlphaTransparencyArtifacts": false, + "redirect": "b5287bf0-4614-4034-bd0a-4c7ed9334ade@6c48a" + } +} diff --git a/assets/resources/game/skills/dead.prefab b/assets/resources/game/skills/dead.prefab index 5d4e5ca1..a469b3f4 100644 --- a/assets/resources/game/skills/dead.prefab +++ b/assets/resources/game/skills/dead.prefab @@ -52,8 +52,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, diff --git a/assets/resources/materials.meta b/assets/resources/materials.meta new file mode 100644 index 00000000..89e55730 --- /dev/null +++ b/assets/resources/materials.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "6f79bd62-4edb-47f3-8625-5073aef9bbbe", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/materials/hit-flash-white.mtl b/assets/resources/materials/hit-flash-white.mtl new file mode 100644 index 00000000..482a210d --- /dev/null +++ b/assets/resources/materials/hit-flash-white.mtl @@ -0,0 +1,32 @@ +{ + "__type__": "cc.Material", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "_effectAsset": { + "__uuid__": "8d9e63b3-9131-4324-83c6-06016b6ada5d", + "__expectedType__": "cc.EffectAsset" + }, + "_techIdx": 0, + "_defines": [ + { + "USE_TEXTURE": true, + "USE_EFFECT": true + } + ], + "_states": [ + { + "rasterizerState": {}, + "depthStencilState": {}, + "blendState": { + "targets": [ + {} + ] + } + } + ], + "_props": [ + {} + ] +} \ No newline at end of file diff --git a/assets/resources/materials/hit-flash-white.mtl.meta b/assets/resources/materials/hit-flash-white.mtl.meta new file mode 100644 index 00000000..94e973ba --- /dev/null +++ b/assets/resources/materials/hit-flash-white.mtl.meta @@ -0,0 +1 @@ +{"ver":"1.0.21","importer":"material","imported":true,"uuid":"a8f34051-ccff-4050-b9d9-234f62977264","files":[".json"],"subMetas":{},"userData":{}} diff --git a/assets/resources/shaders.meta b/assets/resources/shaders.meta new file mode 100644 index 00000000..a05db410 --- /dev/null +++ b/assets/resources/shaders.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "9ecd9621-f033-4d21-8d2c-b33850a80f94", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/shaders/builtin-sprite-hit-flash-white.effect b/assets/resources/shaders/builtin-sprite-hit-flash-white.effect new file mode 100644 index 00000000..2e9988f3 --- /dev/null +++ b/assets/resources/shaders/builtin-sprite-hit-flash-white.effect @@ -0,0 +1,97 @@ +// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd. +CCEffect %{ + techniques: + - passes: + - vert: sprite-vs:vert + frag: sprite-fs:frag + depthStencilState: + depthTest: false + depthWrite: false + blendState: + targets: + - blend: true + blendSrc: src_alpha + blendDst: one_minus_src_alpha + blendDstAlpha: one_minus_src_alpha + rasterizerState: + cullMode: none + properties: + alphaThreshold: { value: 0.5 } +}% + +CCProgram sprite-vs %{ + precision highp float; + #include + #if USE_LOCAL + #include + #endif + #if SAMPLE_FROM_RT + #include + #endif + in vec3 a_position; + in vec2 a_texCoord; + in vec4 a_color; + + out vec4 color; + out vec2 uv0; + out vec4 lightColor; + + vec4 vert () { + vec4 pos = vec4(a_position, 1); + + #if USE_LOCAL + pos = cc_matWorld * pos; + #endif + + #if USE_PIXEL_ALIGNMENT + pos = cc_matView * pos; + pos.xyz = floor(pos.xyz); + pos = cc_matProj * pos; + #else + pos = cc_matViewProj * pos; + #endif + + uv0 = a_texCoord; + #if SAMPLE_FROM_RT + CC_HANDLE_RT_SAMPLE_FLIP(uv0); + #endif + color = a_color; + + lightColor = a_color; + + return pos; + } +}% + +CCProgram sprite-fs %{ + precision highp float; + #include + #include + + in vec4 color; + in vec4 lightColor; + + #if USE_TEXTURE + in vec2 uv0; + #pragma builtin(local) + layout(set = 2, binding = 12) uniform sampler2D cc_spriteTexture; + #endif + + vec4 frag () { + vec4 o = vec4(1, 1, 1, 1); + + #if USE_TEXTURE + o *= CCSampleWithAlphaSeparated(cc_spriteTexture, uv0); + #if IS_GRAY + float gray = 0.2126 * o.r + 0.7152 * o.g + 0.0722 * o.b; + o.r = o.g = o.b = gray; + #endif + #endif + + o.rgb = o.rgb * (1.0 - lightColor.a) + lightColor.rgb * lightColor.a; + + o *= color; + ALPHA_TEST(o); + return o; + } +}% diff --git a/assets/resources/shaders/builtin-sprite-hit-flash-white.effect.meta b/assets/resources/shaders/builtin-sprite-hit-flash-white.effect.meta new file mode 100644 index 00000000..f4f0fae8 --- /dev/null +++ b/assets/resources/shaders/builtin-sprite-hit-flash-white.effect.meta @@ -0,0 +1,15 @@ +{ + "ver": "1.7.1", + "importer": "effect", + "imported": true, + "uuid": "8d9e63b3-9131-4324-83c6-06016b6ada5d", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "combinations": [ + {} + ] + } +} diff --git a/assets/script/game/common/FlashSprite.ts b/assets/script/game/common/FlashSprite.ts new file mode 100644 index 00000000..73c98cce --- /dev/null +++ b/assets/script/game/common/FlashSprite.ts @@ -0,0 +1,29 @@ +import { _decorator, color, Component, Material, Node, Sprite } from 'cc'; +const { ccclass, property } = _decorator; + +@ccclass('FlashSprite') +export class FlashSprite extends Component { + + @property(Material) + hitFlashMaterial: Material; + orginalFlashMaterial: Material; + sprite: Sprite; + + start() { + this.sprite = this.node.getComponent(Sprite); + this.orginalFlashMaterial = this.sprite.getRenderMaterial(0); + + } + + update(deltaTime: number) { + + } + + public clickFlash() { + this.sprite.setSharedMaterial(this.hitFlashMaterial, 0); + this.scheduleOnce(() => { + this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0); + }, 0.1); + } +} + diff --git a/assets/script/game/common/FlashSprite.ts.meta b/assets/script/game/common/FlashSprite.ts.meta new file mode 100644 index 00000000..66cfac4a --- /dev/null +++ b/assets/script/game/common/FlashSprite.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "df953176-a9fa-4f3e-865e-7956fccc4c52", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/map/MapMonsterComp.ts b/assets/script/game/map/MapMonsterComp.ts index 9bab0ee6..a0284c71 100644 --- a/assets/script/game/map/MapMonsterComp.ts +++ b/assets/script/game/map/MapMonsterComp.ts @@ -22,7 +22,7 @@ export class MapMonsterComp extends CCComp { monster_level:number = 1; //怪物池等级 max_monster_level:number = 4; //最高怪物次等级 min_monster_num:number = 2; ///最小每次刷新怪物数量 - max_monster_num:number = 2; //最大每次刷新怪物数量 + max_monster_num:number = 4; //最大每次刷新怪物数量 refresh_timer: Timer = new Timer(5); // 刷新怪物定时器 refresh_cd: Timer = new Timer(0.5); mission_up_timer: Timer = new Timer(30); //波次增加 @@ -49,7 +49,7 @@ export class MapMonsterComp extends CCComp { this.monster_refresh() } if (this.refresh_timer.update(dt)) { - this.setp_num = RandomManager.instance.getRandomInt(this.max_monster_num,this.max_monster_level,2) + this.setp_num = RandomManager.instance.getRandomInt(this.min_monster_num,this.max_monster_num,2) } if (this.mission_up_timer.update(dt)) { // 刷新怪物定时器 diff --git a/assets/script/game/monster/Hero.ts b/assets/script/game/monster/Hero.ts index c7592a9d..3542cff1 100644 --- a/assets/script/game/monster/Hero.ts +++ b/assets/script/game/monster/Hero.ts @@ -73,7 +73,6 @@ export class Hero extends ecs.Entity { mv.scale = 1; mv.change_name(smc.heros[uuid].name,1) this.add(mv); - this.push_monsters_in(uuid,mv.ent.eid) } push_monsters_in(uuid:number=1001,eid:number=0){ smc.monsters_in.push({name:smc.heros[uuid].name,eid:eid}) diff --git a/assets/script/game/monster/HeroCardViewComp.ts b/assets/script/game/monster/HeroCardViewComp.ts index 7a9ccacb..b8f488f7 100644 --- a/assets/script/game/monster/HeroCardViewComp.ts +++ b/assets/script/game/monster/HeroCardViewComp.ts @@ -4,7 +4,7 @@ import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/modu import { data } from "../data/data"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { smc } from "../common/SingletonModuleComp"; -import { CardSet } from "../common/config/CardSet"; +import { CardSet, SkillSet } from "../common/config/CardSet"; import { HeroCard } from "./HeroCard"; import { HeroModelComp } from "./HeroModelComp"; import { Hero } from "./Hero"; @@ -105,7 +105,7 @@ export class HeroCardViewComp extends CCComp { let heros = ecs.query(ecs.allOf(HeroModelComp)) // let heross= ecs.query(ecs.allOf(MonsterViewComp)) // console.log("heross",heross) - if(heros.length >= 4){ + if(heros.length >= 4&&this.card_type == 1){ oops.gui.toast("英雄数量达到上限"); this.node.setPosition(this.pos_x,this.pos_y); return; diff --git a/assets/script/game/monster/MonsterViewComp.ts b/assets/script/game/monster/MonsterViewComp.ts index fc005dce..0f345dce 100644 --- a/assets/script/game/monster/MonsterViewComp.ts +++ b/assets/script/game/monster/MonsterViewComp.ts @@ -5,7 +5,7 @@ * @LastEditTime: 2022-08-17 12:36:18 */ -import { Vec3, _decorator , v3,Collider2D,Contact2DType,IPhysics2DContact,PhysicsSystem2D,EPhysics2DDrawFlags,Label,Node,Prefab,instantiate,ProgressBar} from "cc"; +import { Vec3, _decorator , v3,Collider2D,Contact2DType,IPhysics2DContact,PhysicsSystem2D,EPhysics2DDrawFlags,Label,Node,Prefab,instantiate,ProgressBar, Component, Material, Sprite} from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { MonsterSpine } from "./MonsterSpine"; @@ -24,6 +24,12 @@ const { ccclass, property } = _decorator; @ccclass('MonsterViewComp') // 定义为 Cocos Creator 组件 @ecs.register('MonsterView', false) // 定义为 ECS 组件 export class MonsterViewComp extends CCComp { + + @property(Material) + hitFlashMaterial: Material; + orginalFlashMaterial: Material; + sprite: Sprite; + /** 角色动画 */ as: MonsterSpine = null!; hero_uuid:number = 1001; @@ -41,7 +47,7 @@ export class MonsterViewComp extends CCComp { power_max: number = 100; /** 能量最大值 */ power_speed: number = 1; //能量回复速度每0.1秒回复量 - skill_name: string = "base"; //技能名称 + skill_name: string = "atk"; //技能名称 max_skill_name: string = "base"; //大技能名称 atk: number = 10; /**攻击力 */ @@ -63,6 +69,8 @@ export class MonsterViewComp extends CCComp { /** 视图层逻辑代码分离演示 */ start () { + this.sprite = this.node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite); + this.orginalFlashMaterial = this.sprite.getRenderMaterial(0); // 注册单个碰撞体的回调函数 let collider = this.getComponent(Collider2D); if (collider) { @@ -147,7 +155,7 @@ export class MonsterViewComp extends CCComp { * 如果角色属于正向阵营 (scale == 1) 且 x 轴位置大于等于 0，则直接返回。 * 如果角色属于反向阵营 (scale != 1) 且 x 轴位置小于等于 0，则直接返回。 */ - if ((this.scale === 1 && this.node.position.x >= 0) || (this.scale !== 1 && this.node.position.x <= -180)) { + if ((this.scale === 1 && this.node.position.x >= 120) || (this.scale !== 1 && this.node.position.x <= -180)) { return; } @@ -226,22 +234,33 @@ export class MonsterViewComp extends CCComp { } }); } - load_skill(skill_name){ + load_skill(skill_name:string){ // console.log("load_skill"); let skill = ecs.getEntity(Skill); - let pos = v3(this.scale*30,30) - let speed =400 + let x=30 + if(this.scale==1){ + x=40 + }else{ + x=-20 + } + let pos = v3(x,50) + let speed =350 let scale = this.scale - let range = 120; - skill.load(pos,speed,range,scale,this.node,skill_name,this.atk); + let dis = 30; + console.log(speed); + skill.load(pos,speed,dis,scale,this.node,skill_name,this.atk); } in_atked() { - var path = "game/skills/atked"; - var prefab: Prefab = oops.res.get(path, Prefab)!; - var node = instantiate(prefab); - let pos = v3(0,30) - node.setPosition(pos) - node.parent = this.node; + this.sprite.setSharedMaterial(this.hitFlashMaterial, 0); + this.scheduleOnce(() => { + this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0); + }, 0.1); + // var path = "game/skills/atked"; + // var prefab: Prefab = oops.res.get(path, Prefab)!; + // var node = instantiate(prefab); + // let pos = v3(0,30) + // node.setPosition(pos) + // node.parent = this.node; } dead(){ var path = "game/skills/dead"; @@ -252,8 +271,7 @@ export class MonsterViewComp extends CCComp { } toDestroy(){ this.dead(); - smc.monsters_in = smc.monsters_in.filter(element => element.eid !== this.ent.eid); - smc.monsters_in = smc.monsters_in.filter(element => element.eid !== this.ent.eid); + this.ent.destroy(); } reset() { diff --git a/assets/script/game/skills/Skill.ts b/assets/script/game/skills/Skill.ts index 18c1a294..0cceb5d1 100644 --- a/assets/script/game/skills/Skill.ts +++ b/assets/script/game/skills/Skill.ts @@ -36,7 +36,7 @@ export class Skill extends ecs.Entity { node.setScale(scale,1) //转换pos为世界坐标 node.setPosition(pos) - + console.log(speed) var sv = node.getComponent(SkillCom)!; sv.speed = speed; sv.dis = dis; diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts index b3e4ec95..fc9e1494 100644 --- a/assets/script/game/skills/SkillCom.ts +++ b/assets/script/game/skills/SkillCom.ts @@ -44,7 +44,7 @@ export class SkillCom extends CCComp { tween(this.node).to( 1,{ angle:this.angle,position: this.t_pos}, { onComplete: (target?: object) => { - // this.check_to_destroy() + this.toDestroy() }, } ).start(); }else{ @@ -52,7 +52,7 @@ export class SkillCom extends CCComp { { position: new Vec3(this.node.position.x+this.scale*this.dis,this.node.position.y) }, { onComplete: (target?: object) => { - this.check_to_destroy() + this.toDestroy() }, } ).start(); @@ -66,7 +66,9 @@ export class SkillCom extends CCComp { switch (otherCollider.group){ case BoxSet.MONSTER: case BoxSet.DEFAULT: - this.check_to_destroy() + setTimeout(() => { + this.toDestroy() + }, 10); break } break; @@ -75,7 +77,9 @@ export class SkillCom extends CCComp { case BoxSet.PLAYER: case BoxSet.HERO: case BoxSet.DEFAULT: - this.check_to_destroy() + setTimeout(() => { + this.toDestroy() + }, 10); break } } @@ -91,7 +95,7 @@ export class SkillCom extends CCComp { this.move(deltaTime) // if(Math.abs(this.node.position.x) > this.dis) // { - // this.check_to_destroy() + // this.toDestroy() // } @@ -99,36 +103,17 @@ export class SkillCom extends CCComp { move(dt: number) { // this.node.setPosition(v3(this.node.position.x+dt*this.x_speed*this.scale,this.node.position.y+this.y_speed,this.node.position.z)) } - check_to_destroy(){ if(!this.is_destroy){ this.is_destroy = true; - setTimeout(() => { - this.toDestroy(); - }, 10); - + this.toDestroy(); } } - /** 全局消息逻辑处理 */ - // private onHandler(event: string, args: any) { - // switch (event) { - // case ModuleEvent.Cmd: - // break; - // } - // } toDestroy() { - // this.node.active = false; - // var scene = smc.map.MapView.scene; - // this.node.parent = scene.entityLayer!.node!; - // console.log("toDestroy"); - - // console.log("this.node.isValid"); - setTimeout(() => { - // console.log("SkillCom.node.destroy",this); - this.ent.destroy() - }, 10); - - + if(!this.is_destroy){ + this.is_destroy = true; + if(this.node.isValid) this.node.destroy() + } } /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */ reset() { diff --git a/settings/v2/packages/project.json b/settings/v2/packages/project.json index e7e284a5..7bd9d030 100644 --- a/settings/v2/packages/project.json +++ b/settings/v2/packages/project.json @@ -51,11 +51,11 @@ } ], "collisionMatrix": { - "0": 127, + "0": 103, "1": 55, "2": 79, - "3": 37, - "4": 67, + "3": 36, + "4": 66, "5": 11, "6": 21 }