diff --git a/assets/resources/game/heros/hero/skeleton.atlas b/assets/resources/game/heros/hero/skeleton.atlas index 7425c16d..6dfad82d 100644 --- a/assets/resources/game/heros/hero/skeleton.atlas +++ b/assets/resources/game/heros/hero/skeleton.atlas @@ -1,20 +1,20 @@ skeleton.png -size: 114,36 +size: 100,55 format: RGBA8888 filter: Linear,Linear repeat: none bb - rotate: true - xy: 76, 2 - size: 32, 36 - orig: 32, 36 - offset: 0, 0 - index: -1 -shadow copy 2 rotate: false xy: 2, 2 - size: 72, 32 - orig: 72, 32 + size: 82, 51 + orig: 82, 51 + offset: 0, 0 + index: -1 +shadow + rotate: true + xy: 86, 21 + size: 32, 12 + orig: 32, 12 offset: 0, 0 index: -1 diff --git a/assets/resources/game/heros/hero/skeleton.json b/assets/resources/game/heros/hero/skeleton.json index d3f43249..4ba64ce5 100644 --- a/assets/resources/game/heros/hero/skeleton.json +++ b/assets/resources/game/heros/hero/skeleton.json @@ -1,21 +1,21 @@ { "skeleton": { - "hash": "UMVQVVm4Lh0nxotB4zUgEWRf6M8", + "hash": "Ujid68+V9E1ioDp5+o8EZg0JItI", "spine": "3.8.99", - "x": -36, - "y": -12.59, - "width": 72, - "height": 56.13, + "x": -29.04, + "y": -4.71, + "width": 48, + "height": 34.56, "images": "", "audio": "" }, "bones": [ { "name": "root" }, - { "name": "bone", "parent": "root", "y": 9.33 }, - { "name": "shandow", "parent": "root", "y": 2.91 } + { "name": "bone", "parent": "root", "x": -7.45, "y": 24, "scaleX": 1.0139, "scaleY": 1.0139 }, + { "name": "shandow", "parent": "root", "x": -30.66, "y": -0.37, "scaleX": 1.5, "scaleY": 0.7239 } ], "slots": [ - { "name": "shadow", "bone": "shandow", "attachment": "shadow copy 2" }, + { "name": "shadow", "bone": "shandow", "attachment": "shadow" }, { "name": "bb", "bone": "bone", "attachment": "bb" } ], "skins": [ @@ -23,10 +23,10 @@ "name": "default", "attachments": { "bb": { - "bb": { "x": -0.06, "y": 25.22, "scaleX": 0.5, "scaleY": 0.5, "width": 32, "height": 36 } + "bb": { "x": 6.85, "y": 5.13, "scaleX": 0.1867, "scaleY": 0.1857, "width": 82, "height": 51 } }, "shadow": { - "shadow copy 2": { "y": 0.5, "width": 72, "height": 32 } + "shadow": { "x": 17.08, "width": 32, "height": 12 } } } } @@ -34,30 +34,54 @@ "animations": { "atk": { "bones": { - "bone": { - "rotate": [ + "shandow": { + "scale": [ {}, - { "time": 0.1333, "angle": -3.23 }, - { "time": 0.3333, "angle": -10 }, + { "time": 0.3, "x": 0.682 }, + { "time": 0.4, "x": 0.86 }, { "time": 0.5 } ] }, - "shandow": { - "translate": [ + "bone": { + "scale": [ {}, - { "time": 0.3333, "x": 3.32 }, + { "time": 0.3, "x": 0.682 }, + { "time": 0.4, "x": 1.06 }, { "time": 0.5 } ] } } }, + "magic": { + "bones": { + "bone": { + "scale": [ + { "x": 0.986, "y": 0.986 }, + { "time": 0.2, "x": 1.153, "y": 0.896 }, + { "time": 0.4, "x": 0.789, "y": 1.085, "curve": "stepped" }, + { "time": 0.5333, "x": 0.789, "y": 1.085 }, + { "time": 0.6667, "x": 0.986, "y": 0.986 } + ] + }, + "shandow": { + "scale": [ + {}, + { "time": 0.2, "x": 1.1 }, + { "time": 0.4, "x": 0.9, "curve": "stepped" }, + { "time": 0.5333, "x": 0.9 }, + { "time": 0.6333, "x": 1.5 }, + { "time": 0.6667 } + ] + } + } + }, "move": { "bones": { "shandow": { "scale": [ {}, - { "time": 0.5, "x": 1.099 }, - { "time": 0.9333 } + { "time": 0.5, "x": 1.106 }, + { "time": 1 } ] }, "bone": { diff --git a/assets/resources/game/heros/hero/skeleton.png b/assets/resources/game/heros/hero/skeleton.png index 8115a1a4..bc7d7218 100644 Binary files a/assets/resources/game/heros/hero/skeleton.png and b/assets/resources/game/heros/hero/skeleton.png differ diff --git a/assets/resources/game/heros/hero/skeleton.png.meta b/assets/resources/game/heros/hero/skeleton.png.meta index 143efec6..ee37ea05 100644 --- a/assets/resources/game/heros/hero/skeleton.png.meta +++ b/assets/resources/game/heros/hero/skeleton.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 2, "trimY": 2, - "width": 110, - "height": 32, - "rawWidth": 114, - "rawHeight": 36, + "width": 96, + "height": 51, + "rawWidth": 100, + "rawHeight": 55, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -55, - -16, + -48, + -25.5, 0, - 55, - -16, + 48, + -25.5, 0, - -55, - 16, + -48, + 25.5, 0, - 55, - 16, + 48, + 25.5, 0 ], "indexes": [ @@ -84,32 +84,32 @@ ], "uv": [ 2, - 34, - 112, - 34, + 53, + 98, + 53, 2, 2, - 112, + 98, 2 ], "nuv": [ - 0.017543859649122806, - 0.05555555555555555, - 0.9824561403508771, - 0.05555555555555555, - 0.017543859649122806, - 0.9444444444444444, - 0.9824561403508771, - 0.9444444444444444 + 0.02, + 0.03636363636363636, + 0.98, + 0.03636363636363636, + 0.02, + 0.9636363636363636, + 0.98, + 0.9636363636363636 ], "minPos": [ - -55, - -16, + -48, + -25.5, 0 ], "maxPos": [ - 55, - 16, + 48, + 25.5, 0 ] }, diff --git a/assets/resources/game/monster/hero.prefab b/assets/resources/game/monster/hero.prefab index 6be40a37..a5cc08b1 100644 --- a/assets/resources/game/monster/hero.prefab +++ b/assets/resources/game/monster/hero.prefab @@ -22,20 +22,26 @@ "__id__": 2 }, { - "__id__": 8 + "__id__": 27 }, { - "__id__": 33 + "__id__": 41 }, { - "__id__": 47 - }, - { - "__id__": 51 + "__id__": 45 } ], "_active": true, "_components": [ + { + "__id__": 49 + }, + { + "__id__": 51 + }, + { + "__id__": 53 + }, { "__id__": 55 }, @@ -44,19 +50,10 @@ }, { "__id__": 59 - }, - { - "__id__": 61 - }, - { - "__id__": 63 - }, - { - "__id__": 65 } ], "_prefab": { - "__id__": 67 + "__id__": 61 }, "_lpos": { "__type__": "cc.Vec3", @@ -87,142 +84,6 @@ }, "_id": "" }, - { - "__type__": "cc.Node", - "_name": "shader", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - } - ], - "_prefab": { - "__id__": 7 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1, - "_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": 165, - "height": 119 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f7NISe7HdAD68SLfhnddy8" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "b1745dc0-d78b-4443-a4fc-746ff6749b39@f9941", - "__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": "e71ctEmpxFC4KlSYRZNz/a" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "66VNgwnoRDmprg2mtbH825", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.Node", "_name": "avatar", @@ -233,23 +94,23 @@ }, "_children": [ { - "__id__": 9 + "__id__": 3 } ], "_active": true, "_components": [ { - "__id__": 25 + "__id__": 19 }, { - "__id__": 27 + "__id__": 21 }, { - "__id__": 30 + "__id__": 24 } ], "_prefab": { - "__id__": 32 + "__id__": 26 }, "_lpos": { "__type__": "cc.Vec3", @@ -286,24 +147,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 8 + "__id__": 2 }, "_children": [ { - "__id__": 10 + "__id__": 4 }, { - "__id__": 16 + "__id__": 10 } ], "_active": true, "_components": [ { - "__id__": 22 + "__id__": 16 } ], "_prefab": { - "__id__": 24 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -340,25 +201,25 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 9 + "__id__": 3 }, "_children": [], "_active": true, "_components": [ { - "__id__": 11 + "__id__": 5 }, { - "__id__": 13 + "__id__": 7 } ], "_prefab": { - "__id__": 15 + "__id__": 9 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -5, + "y": -25.5, "z": 0 }, "_lrot": { @@ -390,11 +251,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 4 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 6 }, "_contentSize": { "__type__": "cc.Size", @@ -418,11 +279,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 10 + "__id__": 4 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 8 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -476,20 +337,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 9 + "__id__": 3 }, "_children": [], "_active": false, "_components": [ { - "__id__": 17 + "__id__": 11 }, { - "__id__": 19 + "__id__": 13 } ], "_prefab": { - "__id__": 21 + "__id__": 15 }, "_lpos": { "__type__": "cc.Vec3", @@ -526,11 +387,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 18 + "__id__": 12 }, "_contentSize": { "__type__": "cc.Size", @@ -554,11 +415,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 14 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -612,11 +473,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 9 + "__id__": 3 }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", @@ -653,21 +514,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 20 }, "_contentSize": { "__type__": "cc.Size", - "width": 128, - "height": 160.740005 + "width": 72, + "height": 56.130001068115234 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.49101561307907104, - "y": 0.08143585731770167 + "x": 0.5, + "y": 0.22430072889736086 }, "_id": "" }, @@ -681,11 +542,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 22 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -709,7 +570,7 @@ "_cacheMode": 1, "_sockets": [ { - "__id__": 29 + "__id__": 23 } ], "_useTint": false, @@ -728,7 +589,7 @@ "__type__": "sp.Skeleton.SpineSocket", "path": "root/bone", "target": { - "__id__": 9 + "__id__": 3 } }, { @@ -737,11 +598,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 25 }, "_id": "" }, @@ -772,20 +633,20 @@ }, "_children": [ { - "__id__": 34 + "__id__": 28 } ], "_active": true, "_components": [ { - "__id__": 42 + "__id__": 36 }, { - "__id__": 44 + "__id__": 38 } ], "_prefab": { - "__id__": 46 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", @@ -822,23 +683,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 33 + "__id__": 27 }, "_children": [], "_active": true, "_components": [ { - "__id__": 35 + "__id__": 29 }, { - "__id__": 37 + "__id__": 31 }, { - "__id__": 39 + "__id__": 33 } ], "_prefab": { - "__id__": 41 + "__id__": 35 }, "_lpos": { "__type__": "cc.Vec3", @@ -875,11 +736,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 30 }, "_contentSize": { "__type__": "cc.Size", @@ -903,11 +764,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 32 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -971,11 +832,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 34 }, "_id": "" }, @@ -1002,11 +863,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 37 }, "_contentSize": { "__type__": "cc.Size", @@ -1030,11 +891,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 33 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 39 }, "_resizeMode": 1, "_layoutType": 2, @@ -1087,11 +948,11 @@ "_active": true, "_components": [ { - "__id__": 48 + "__id__": 42 } ], "_prefab": { - "__id__": 50 + "__id__": 44 }, "_lpos": { "__type__": "cc.Vec3", @@ -1128,11 +989,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 47 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 43 }, "_contentSize": { "__type__": "cc.Size", @@ -1175,11 +1036,11 @@ "_active": true, "_components": [ { - "__id__": 52 + "__id__": 46 } ], "_prefab": { - "__id__": 54 + "__id__": 48 }, "_lpos": { "__type__": "cc.Vec3", @@ -1216,11 +1077,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 51 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -1261,7 +1122,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 56 + "__id__": 50 }, "_contentSize": { "__type__": "cc.Size", @@ -1289,7 +1150,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 52 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1331,10 +1192,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 54 }, "animator": { - "__id__": 30 + "__id__": 24 }, "_id": "" }, @@ -1352,7 +1213,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 56 }, "_id": "" }, @@ -1370,7 +1231,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 58 }, "tag": 0, "_group": 2, @@ -1404,7 +1265,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 60 }, "enabledContactListener": true, "bullet": true, diff --git a/assets/resources/game/skills/SlashFX.png b/assets/resources/game/skills/SlashFX.png deleted file mode 100644 index 6d583be2..00000000 Binary files a/assets/resources/game/skills/SlashFX.png and /dev/null differ diff --git a/assets/resources/game/skills/SlashFX.png.meta b/assets/resources/game/skills/SlashFX.png.meta deleted file mode 100644 index 58e13ae1..00000000 --- a/assets/resources/game/skills/SlashFX.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "0291f2d2-3ad7-4064-80b9-a99705a3392c", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "0291f2d2-3ad7-4064-80b9-a99705a3392c@6c48a", - "displayName": "SlashFX", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "0291f2d2-3ad7-4064-80b9-a99705a3392c", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "0291f2d2-3ad7-4064-80b9-a99705a3392c@f9941", - "displayName": "SlashFX", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 39, - "trimY": 12, - "width": 418, - "height": 472, - "rawWidth": 496, - "rawHeight": 496, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -209, - -236, - 0, - 209, - -236, - 0, - -209, - 236, - 0, - 209, - 236, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 39, - 484, - 457, - 484, - 39, - 12, - 457, - 12 - ], - "nuv": [ - 0.07862903225806452, - 0.024193548387096774, - 0.9213709677419355, - 0.024193548387096774, - 0.07862903225806452, - 0.9758064516129032, - 0.9213709677419355, - 0.9758064516129032 - ], - "minPos": [ - -209, - -236, - 0 - ], - "maxPos": [ - 209, - 236, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "0291f2d2-3ad7-4064-80b9-a99705a3392c@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "redirect": "0291f2d2-3ad7-4064-80b9-a99705a3392c@f9941" - } -} diff --git a/assets/resources/game/skills/atked.meta b/assets/resources/game/skills/atked.meta new file mode 100644 index 00000000..57a60bbb --- /dev/null +++ b/assets/resources/game/skills/atked.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "8c0a92f5-59bf-4269-80b0-1864542c72f5", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/atked.prefab b/assets/resources/game/skills/atked.prefab new file mode 100644 index 00000000..130731fa --- /dev/null +++ b/assets/resources/game/skills/atked.prefab @@ -0,0 +1,146 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "atked", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "atked", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 2 + }, + { + "__id__": 4 + } + ], + "_prefab": { + "__id__": 6 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 6.112, + "y": 45.573, + "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": 1, + "_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": 33.599998474121094, + "height": 56.099998474121094 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.4973262099356479 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a7pn5tzA1BSI1AfdpVsHh7" + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 5 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_skeletonData": { + "__uuid__": "2309ba59-9c86-4995-a595-abc5e63a8833", + "__expectedType__": "sp.SkeletonData" + }, + "defaultSkin": "default", + "defaultAnimation": "animation", + "_premultipliedAlpha": true, + "_timeScale": 1, + "_preCacheMode": 0, + "_cacheMode": 0, + "_sockets": [], + "_useTint": false, + "_debugMesh": false, + "_debugBones": false, + "_debugSlots": false, + "_enableBatch": false, + "loop": true, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "38BwtUqNBFS5wrOvMgZuHn" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "cfqCWnxbFLNoQMedQXsav3", + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/base_skill.prefab.meta b/assets/resources/game/skills/atked.prefab.meta similarity index 61% rename from assets/resources/game/skills/base_skill.prefab.meta rename to assets/resources/game/skills/atked.prefab.meta index 843dc767..2a6d218c 100644 --- a/assets/resources/game/skills/base_skill.prefab.meta +++ b/assets/resources/game/skills/atked.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "1a72abf0-0105-4da5-b7d1-55355b29645b", + "uuid": "6f1733da-e0e0-4de8-b549-28e9a85bce45", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "base_skill" + "syncNodeName": "atked" } } diff --git a/assets/resources/game/skills/atked/skeleton.atlas b/assets/resources/game/skills/atked/skeleton.atlas new file mode 100644 index 00000000..c343d1c2 --- /dev/null +++ b/assets/resources/game/skills/atked/skeleton.atlas @@ -0,0 +1,20 @@ + +skeleton.png +size: 270,76 +format: RGBA8888 +filter: Linear,Linear +repeat: none +shock + rotate: true + xy: 191, 2 + size: 72, 77 + orig: 72, 83 + offset: 0, 3 + index: -1 +shock2 + rotate: true + xy: 2, 23 + size: 51, 187 + orig: 112, 187 + offset: 31, 0 + index: -1 diff --git a/assets/resources/game/skills/atked/skeleton.atlas.meta b/assets/resources/game/skills/atked/skeleton.atlas.meta new file mode 100644 index 00000000..595093e8 --- /dev/null +++ b/assets/resources/game/skills/atked/skeleton.atlas.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.1", + "importer": "*", + "imported": true, + "uuid": "868f74aa-e494-4ff3-a215-68e6279fce6c", + "files": [ + ".atlas", + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/atked/skeleton.json b/assets/resources/game/skills/atked/skeleton.json new file mode 100644 index 00000000..973fd355 --- /dev/null +++ b/assets/resources/game/skills/atked/skeleton.json @@ -0,0 +1,41 @@ +{ +"skeleton": { + "hash": "Vb/ssedFfDJsjUnry/6JQl8TvS0", + "spine": "3.8.99", + "x": -4.26, + "y": -12.15, + "width": 8.52, + "height": 24.9, + "images": "D:/Game/方块英雄/skills/ATCED", + "audio": "" +}, +"bones": [ + { "name": "root", "scaleX": 0.1585, "scaleY": 0.3 } +], +"slots": [ + { "name": "shock", "bone": "root", "attachment": "shock" } +], +"skins": [ + { + "name": "default", + "attachments": { + "shock": { + "shock": { "y": 1, "scaleX": 0.7465, "width": 72, "height": 83 }, + "shock2": { "y": 0.5, "width": 112, "height": 187 } + } + } + } +], +"animations": { + "animation": { + "bones": { + "root": { + "scale": [ + { "x": 0.333, "y": 0.333 }, + { "time": 0.3333, "x": 3.333, "y": 3.333 } + ] + } + } + } +} +} \ No newline at end of file diff --git a/assets/resources/game/skills/atked/skeleton.json.meta b/assets/resources/game/skills/atked/skeleton.json.meta new file mode 100644 index 00000000..b16d3d8d --- /dev/null +++ b/assets/resources/game/skills/atked/skeleton.json.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.2.6", + "importer": "spine-data", + "imported": true, + "uuid": "6a4fc12c-e408-49f9-9b85-cdffa4b7190f", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/atked/skeleton.png b/assets/resources/game/skills/atked/skeleton.png new file mode 100644 index 00000000..78218920 Binary files /dev/null and b/assets/resources/game/skills/atked/skeleton.png differ diff --git a/assets/resources/game/skills/atked/skeleton.png.meta b/assets/resources/game/skills/atked/skeleton.png.meta new file mode 100644 index 00000000..b708a89f --- /dev/null +++ b/assets/resources/game/skills/atked/skeleton.png.meta @@ -0,0 +1,42 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "293ade68-2fb2-4dff-909e-4f12ca51f975", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "293ade68-2fb2-4dff-909e-4f12ca51f975@6c48a", + "displayName": "skeleton", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "293ade68-2fb2-4dff-909e-4f12ca51f975", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "texture", + "fixAlphaTransparencyArtifacts": false, + "redirect": "293ade68-2fb2-4dff-909e-4f12ca51f975@6c48a" + } +} diff --git a/assets/resources/game/skills/atked2.meta b/assets/resources/game/skills/atked2.meta new file mode 100644 index 00000000..974c68eb --- /dev/null +++ b/assets/resources/game/skills/atked2.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "03a08c3e-98fa-47c1-b8c4-83253a1134c0", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/atked2/skeleton.atlas b/assets/resources/game/skills/atked2/skeleton.atlas new file mode 100644 index 00000000..3d4a3253 --- /dev/null +++ b/assets/resources/game/skills/atked2/skeleton.atlas @@ -0,0 +1,27 @@ + +skeleton.png +size: 191,129 +format: RGBA8888 +filter: Linear,Linear +repeat: none +shock + rotate: true + xy: 2, 2 + size: 72, 77 + orig: 72, 83 + offset: 0, 3 + index: -1 +shock2 + rotate: true + xy: 2, 76 + size: 51, 187 + orig: 112, 187 + offset: 31, 0 + index: -1 +shock3 + rotate: false + xy: 81, 2 + size: 72, 72 + orig: 72, 72 + offset: 0, 0 + index: -1 diff --git a/assets/resources/game/skills/atked2/skeleton.atlas.meta b/assets/resources/game/skills/atked2/skeleton.atlas.meta new file mode 100644 index 00000000..97c1f1e2 --- /dev/null +++ b/assets/resources/game/skills/atked2/skeleton.atlas.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.1", + "importer": "*", + "imported": true, + "uuid": "91931c12-0fa3-4f90-bbb2-7e77bcefd516", + "files": [ + ".atlas", + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/atked2/skeleton.json b/assets/resources/game/skills/atked2/skeleton.json new file mode 100644 index 00000000..6fb7b8a2 --- /dev/null +++ b/assets/resources/game/skills/atked2/skeleton.json @@ -0,0 +1,42 @@ +{ +"skeleton": { + "hash": "bV8kosUDGMav7+mfda32D8b+h00", + "spine": "3.8.99", + "x": -7.77, + "y": -10.8, + "width": 15.53, + "height": 21.6, + "images": "D:/Game/方块英雄/skills/ATCED", + "audio": "" +}, +"bones": [ + { "name": "root", "scaleX": 0.2158, "scaleY": 0.3 } +], +"slots": [ + { "name": "shock", "bone": "root", "attachment": "shock3" } +], +"skins": [ + { + "name": "default", + "attachments": { + "shock": { + "shock": { "y": 1, "scaleX": 0.7465, "width": 72, "height": 83 }, + "shock2": { "y": 0.5, "width": 112, "height": 187 }, + "shock3": { "width": 72, "height": 72 } + } + } + } +], +"animations": { + "animation": { + "bones": { + "root": { + "scale": [ + { "x": 0.333, "y": 0.333 }, + { "time": 0.3333, "x": 3.333, "y": 3.333 } + ] + } + } + } +} +} \ No newline at end of file diff --git a/assets/resources/game/skills/atked2/skeleton.json.meta b/assets/resources/game/skills/atked2/skeleton.json.meta new file mode 100644 index 00000000..11702f9d --- /dev/null +++ b/assets/resources/game/skills/atked2/skeleton.json.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.2.6", + "importer": "spine-data", + "imported": true, + "uuid": "2309ba59-9c86-4995-a595-abc5e63a8833", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/atked2/skeleton.png b/assets/resources/game/skills/atked2/skeleton.png new file mode 100644 index 00000000..9d5ea467 Binary files /dev/null and b/assets/resources/game/skills/atked2/skeleton.png differ diff --git a/assets/resources/game/skills/atked2/skeleton.png.meta b/assets/resources/game/skills/atked2/skeleton.png.meta new file mode 100644 index 00000000..759bf6dd --- /dev/null +++ b/assets/resources/game/skills/atked2/skeleton.png.meta @@ -0,0 +1,42 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "fcc08bcd-bf6b-436c-985c-ff4adceba252", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "fcc08bcd-bf6b-436c-985c-ff4adceba252@6c48a", + "displayName": "skeleton", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "fcc08bcd-bf6b-436c-985c-ff4adceba252", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "texture", + "fixAlphaTransparencyArtifacts": false, + "redirect": "fcc08bcd-bf6b-436c-985c-ff4adceba252@6c48a" + } +} diff --git a/assets/resources/game/skills/base/berseker_trailing_0-0.png b/assets/resources/game/skills/base/berseker_trailing_0-0.png deleted file mode 100644 index 04324e7e..00000000 Binary files a/assets/resources/game/skills/base/berseker_trailing_0-0.png and /dev/null differ diff --git a/assets/resources/game/skills/base/berseker_trailing_0-0.png.meta b/assets/resources/game/skills/base/berseker_trailing_0-0.png.meta deleted file mode 100644 index 8e9a3e7a..00000000 --- a/assets/resources/game/skills/base/berseker_trailing_0-0.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "16ace7cb-aff6-4421-abe3-24f6d1c863a1", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "16ace7cb-aff6-4421-abe3-24f6d1c863a1@6c48a", - "displayName": "berseker_trailing_0-0", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "16ace7cb-aff6-4421-abe3-24f6d1c863a1", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "16ace7cb-aff6-4421-abe3-24f6d1c863a1@f9941", - "displayName": "berseker_trailing_0-0", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 218, - "height": 168, - "rawWidth": 218, - "rawHeight": 168, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -109, - -84, - 0, - 109, - -84, - 0, - -109, - 84, - 0, - 109, - 84, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 168, - 218, - 168, - 0, - 0, - 218, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -109, - -84, - 0 - ], - "maxPos": [ - 109, - 84, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "16ace7cb-aff6-4421-abe3-24f6d1c863a1@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "redirect": "16ace7cb-aff6-4421-abe3-24f6d1c863a1@f9941" - } -} diff --git a/assets/resources/game/skills/base/berseker_trailing_0-14.png b/assets/resources/game/skills/base/berseker_trailing_0-14.png deleted file mode 100644 index 8bc38ef2..00000000 Binary files a/assets/resources/game/skills/base/berseker_trailing_0-14.png and /dev/null differ diff --git a/assets/resources/game/skills/base/berseker_trailing_0-14.png.meta b/assets/resources/game/skills/base/berseker_trailing_0-14.png.meta deleted file mode 100644 index 186da0af..00000000 --- a/assets/resources/game/skills/base/berseker_trailing_0-14.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "e6708482-f539-4ffc-aea8-9f53001f55d3", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "e6708482-f539-4ffc-aea8-9f53001f55d3@6c48a", - "displayName": "berseker_trailing_0-14", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "e6708482-f539-4ffc-aea8-9f53001f55d3", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "e6708482-f539-4ffc-aea8-9f53001f55d3@f9941", - "displayName": "berseker_trailing_0-14", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 99, - "height": 142, - "rawWidth": 99, - "rawHeight": 142, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -49.5, - -71, - 0, - 49.5, - -71, - 0, - -49.5, - 71, - 0, - 49.5, - 71, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 142, - 99, - 142, - 0, - 0, - 99, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -49.5, - -71, - 0 - ], - "maxPos": [ - 49.5, - 71, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "e6708482-f539-4ffc-aea8-9f53001f55d3@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "redirect": "e6708482-f539-4ffc-aea8-9f53001f55d3@f9941" - } -} diff --git a/assets/resources/game/skills/base/skeleton.atlas b/assets/resources/game/skills/base/skeleton.atlas new file mode 100644 index 00000000..db26fe67 --- /dev/null +++ b/assets/resources/game/skills/base/skeleton.atlas @@ -0,0 +1,13 @@ + +skeleton.png +size: 112,126 +format: RGBA8888 +filter: Linear,Linear +repeat: none +SlashFX + rotate: false + xy: 2, 2 + size: 108, 122 + orig: 128, 128 + offset: 10, 3 + index: -1 diff --git a/assets/resources/game/skills/base/skeleton.atlas.meta b/assets/resources/game/skills/base/skeleton.atlas.meta new file mode 100644 index 00000000..d95b2d1a --- /dev/null +++ b/assets/resources/game/skills/base/skeleton.atlas.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.1", + "importer": "*", + "imported": true, + "uuid": "7dfe95a3-a115-498c-89e7-7f065be4557c", + "files": [ + ".atlas", + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/base/skeleton.json b/assets/resources/game/skills/base/skeleton.json new file mode 100644 index 00000000..9b97e4f5 --- /dev/null +++ b/assets/resources/game/skills/base/skeleton.json @@ -0,0 +1,45 @@ +{ +"skeleton": { + "hash": "xk8FIIMxVBwhqa/vQ+2zpo2cDWg", + "spine": "3.8.99", + "x": -123.74, + "y": -43.97, + "width": 173.38, + "height": 173.38, + "images": "", + "audio": "" +}, +"bones": [ + { "name": "root", "y": -1.51 }, + { "name": "bone", "parent": "root", "length": 71.92, "rotation": 103.92, "x": 0.11, "y": 0.27 } +], +"slots": [ + { "name": "SlashFX", "bone": "bone", "attachment": "SlashFX" } +], +"skins": [ + { + "name": "default", + "attachments": { + "SlashFX": { + "SlashFX": { "x": 51.62, "y": 25.5, "rotation": -75.62, "width": 128, "height": 128 } + } + } + } +], +"animations": { + "animation": { + "bones": { + "bone": { + "rotate": [ + {}, + { "time": 0.5, "angle": -58.15 } + ], + "translate": [ + {}, + { "time": 0.5, "x": 10.32, "y": -79.39 } + ] + } + } + } +} +} \ No newline at end of file diff --git a/assets/resources/game/skills/base/skeleton.json.meta b/assets/resources/game/skills/base/skeleton.json.meta new file mode 100644 index 00000000..e3f19304 --- /dev/null +++ b/assets/resources/game/skills/base/skeleton.json.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.2.6", + "importer": "spine-data", + "imported": true, + "uuid": "13735ea1-2867-4a01-94e2-c33d3f294a1a", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/skills/base/skeleton.png b/assets/resources/game/skills/base/skeleton.png new file mode 100644 index 00000000..dbd7c8ec Binary files /dev/null and b/assets/resources/game/skills/base/skeleton.png differ diff --git a/assets/resources/game/skills/base/skeleton.png.meta b/assets/resources/game/skills/base/skeleton.png.meta new file mode 100644 index 00000000..26413028 --- /dev/null +++ b/assets/resources/game/skills/base/skeleton.png.meta @@ -0,0 +1,42 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "a232f5f1-0158-4c91-864f-cfe3fafc46a6", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "a232f5f1-0158-4c91-864f-cfe3fafc46a6@6c48a", + "displayName": "skeleton", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "a232f5f1-0158-4c91-864f-cfe3fafc46a6", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "texture", + "fixAlphaTransparencyArtifacts": false, + "redirect": "a232f5f1-0158-4c91-864f-cfe3fafc46a6@6c48a" + } +} diff --git a/assets/resources/game/skills/base_skill.prefab b/assets/resources/game/skills/base_skill.prefab deleted file mode 100644 index 674d1696..00000000 --- a/assets/resources/game/skills/base_skill.prefab +++ /dev/null @@ -1,682 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "base_skill", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "base_skill", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - } - ], - "_active": true, - "_components": [ - { - "__id__": 14 - } - ], - "_prefab": { - "__id__": 16 - }, - "_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": "berseker_trailing_0-0", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - }, - { - "__id__": 7 - }, - { - "__id__": 9 - }, - { - "__id__": 11 - } - ], - "_prefab": { - "__id__": 13 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": -1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 4 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 218, - "height": 168 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f5VOQfP/hDoY6cb45zvH/R" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "16ace7cb-aff6-4421-abe3-24f6d1c863a1@f9941", - "__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": "31LD58ujBOqJJOl+/xQyvl" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 8 - }, - "playOnLoad": true, - "_clips": [ - { - "__uuid__": "9fe5e340-ceaa-468a-8aff-e684a0b31e45", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "9fe5e340-ceaa-468a-8aff-e684a0b31e45", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "19nhn0VKRDo62VkJ++pduZ" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 10 - }, - "enabledContactListener": true, - "bullet": false, - "awakeOnLoad": true, - "_group": 1, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 0, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "06IsZthe1HUazWEydcUmIW" - }, - { - "__type__": "cc.PolygonCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 12 - }, - "tag": 0, - "_group": 16, - "_density": 0, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_points": [ - { - "__type__": "cc.Vec2", - "x": 7, - "y": 84 - }, - { - "__type__": "cc.Vec2", - "x": -18, - "y": 81 - }, - { - "__type__": "cc.Vec2", - "x": -35, - "y": 76 - }, - { - "__type__": "cc.Vec2", - "x": -52, - "y": 67 - }, - { - "__type__": "cc.Vec2", - "x": -62, - "y": 58 - }, - { - "__type__": "cc.Vec2", - "x": -64, - "y": 58 - }, - { - "__type__": "cc.Vec2", - "x": -78, - "y": 43 - }, - { - "__type__": "cc.Vec2", - "x": -78, - "y": 41 - }, - { - "__type__": "cc.Vec2", - "x": -81, - "y": 39 - }, - { - "__type__": "cc.Vec2", - "x": -81, - "y": 37 - }, - { - "__type__": "cc.Vec2", - "x": -87, - "y": 30 - }, - { - "__type__": "cc.Vec2", - "x": -90, - "y": 21 - }, - { - "__type__": "cc.Vec2", - "x": -94, - "y": 15 - }, - { - "__type__": "cc.Vec2", - "x": -94, - "y": 12 - }, - { - "__type__": "cc.Vec2", - "x": -96, - "y": 10 - }, - { - "__type__": "cc.Vec2", - "x": -99, - "y": -5 - }, - { - "__type__": "cc.Vec2", - "x": -101, - "y": -5 - }, - { - "__type__": "cc.Vec2", - "x": -102, - "y": -1 - }, - { - "__type__": "cc.Vec2", - "x": -105, - "y": -1 - }, - { - "__type__": "cc.Vec2", - "x": -109, - "y": -28 - }, - { - "__type__": "cc.Vec2", - "x": -109, - "y": -40 - }, - { - "__type__": "cc.Vec2", - "x": -105, - "y": -60 - }, - { - "__type__": "cc.Vec2", - "x": -94, - "y": -71 - }, - { - "__type__": "cc.Vec2", - "x": -86, - "y": -74 - }, - { - "__type__": "cc.Vec2", - "x": -83, - "y": -77 - }, - { - "__type__": "cc.Vec2", - "x": -79, - "y": -77 - }, - { - "__type__": "cc.Vec2", - "x": -75, - "y": -80 - }, - { - "__type__": "cc.Vec2", - "x": -64, - "y": -83 - }, - { - "__type__": "cc.Vec2", - "x": -54, - "y": -84 - }, - { - "__type__": "cc.Vec2", - "x": -36, - "y": -82 - }, - { - "__type__": "cc.Vec2", - "x": -21, - "y": -77 - }, - { - "__type__": "cc.Vec2", - "x": -21, - "y": -75 - }, - { - "__type__": "cc.Vec2", - "x": -16, - "y": -74 - }, - { - "__type__": "cc.Vec2", - "x": -9, - "y": -68 - }, - { - "__type__": "cc.Vec2", - "x": -30, - "y": -45 - }, - { - "__type__": "cc.Vec2", - "x": -40, - "y": -21 - }, - { - "__type__": "cc.Vec2", - "x": -43, - "y": -4 - }, - { - "__type__": "cc.Vec2", - "x": -42, - "y": 14 - }, - { - "__type__": "cc.Vec2", - "x": -38, - "y": 26 - }, - { - "__type__": "cc.Vec2", - "x": -35, - "y": 29 - }, - { - "__type__": "cc.Vec2", - "x": -34, - "y": 33 - }, - { - "__type__": "cc.Vec2", - "x": -31, - "y": 35 - }, - { - "__type__": "cc.Vec2", - "x": -31, - "y": 37 - }, - { - "__type__": "cc.Vec2", - "x": -21, - "y": 47 - }, - { - "__type__": "cc.Vec2", - "x": -19, - "y": 47 - }, - { - "__type__": "cc.Vec2", - "x": -12, - "y": 53 - }, - { - "__type__": "cc.Vec2", - "x": 7, - "y": 61 - }, - { - "__type__": "cc.Vec2", - "x": 29, - "y": 64 - }, - { - "__type__": "cc.Vec2", - "x": 50, - "y": 62 - }, - { - "__type__": "cc.Vec2", - "x": 69, - "y": 56 - }, - { - "__type__": "cc.Vec2", - "x": 75, - "y": 53 - }, - { - "__type__": "cc.Vec2", - "x": 76, - "y": 51 - }, - { - "__type__": "cc.Vec2", - "x": 82, - "y": 49 - }, - { - "__type__": "cc.Vec2", - "x": 91, - "y": 41 - }, - { - "__type__": "cc.Vec2", - "x": 93, - "y": 41 - }, - { - "__type__": "cc.Vec2", - "x": 109, - "y": 24 - }, - { - "__type__": "cc.Vec2", - "x": 108, - "y": 29 - }, - { - "__type__": "cc.Vec2", - "x": 106, - "y": 30 - }, - { - "__type__": "cc.Vec2", - "x": 102, - "y": 38 - }, - { - "__type__": "cc.Vec2", - "x": 99, - "y": 40 - }, - { - "__type__": "cc.Vec2", - "x": 99, - "y": 42 - }, - { - "__type__": "cc.Vec2", - "x": 84, - "y": 57 - }, - { - "__type__": "cc.Vec2", - "x": 82, - "y": 57 - }, - { - "__type__": "cc.Vec2", - "x": 73, - "y": 65 - }, - { - "__type__": "cc.Vec2", - "x": 54, - "y": 74 - }, - { - "__type__": "cc.Vec2", - "x": 51, - "y": 74 - }, - { - "__type__": "cc.Vec2", - "x": 45, - "y": 78 - }, - { - "__type__": "cc.Vec2", - "x": 21, - "y": 84 - } - ], - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "65rqaLzvBD8YcX0gqDRJJI" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "b17xZtUyRBpbVHdpGhM+F5", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "37LDXjmBpMvJq0MAzcAkc/" - }, - { - "__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/skills.anim b/assets/resources/game/skills/skills.anim deleted file mode 100644 index 6733bccc..00000000 --- a/assets/resources/game/skills/skills.anim +++ /dev/null @@ -1,207 +0,0 @@ -[ - { - "__type__": "cc.AnimationClip", - "_name": "skills", - "_objFlags": 0, - "__editorExtras__": { - "embeddedPlayerGroups": [] - }, - "_native": "", - "sample": 60, - "speed": 1, - "wrapMode": 2, - "enableTrsBlending": false, - "_duration": 0.3333333333333333, - "_hash": 500763545, - "_tracks": [ - { - "__id__": 1 - } - ], - "_exoticAnimation": null, - "_events": [ - { - "frame": 0, - "func": "", - "params": [] - } - ], - "_embeddedPlayers": [], - "_additiveSettings": { - "__id__": 11 - }, - "_auxiliaryCurveEntries": [] - }, - { - "__type__": "cc.animation.VectorTrack", - "_binding": { - "__type__": "cc.animation.TrackBinding", - "path": { - "__id__": 2 - }, - "proxy": null - }, - "_channels": [ - { - "__id__": 3 - }, - { - "__id__": 5 - }, - { - "__id__": 7 - }, - { - "__id__": 9 - } - ], - "_nComponents": 3 - }, - { - "__type__": "cc.animation.TrackPath", - "_paths": [ - "eulerAngles" - ] - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 4 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.3333333432674408 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 6 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.3333333432674408 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 8 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.3333333432674408 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 90, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": -30, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 10 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [], - "_values": [], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.AnimationClipAdditiveSettings", - "enabled": false, - "refClip": null - } -] \ No newline at end of file diff --git a/assets/resources/game/skills/skills.anim.meta b/assets/resources/game/skills/skills.anim.meta deleted file mode 100644 index 3062d544..00000000 --- a/assets/resources/game/skills/skills.anim.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "2.0.3", - "importer": "animation-clip", - "imported": true, - "uuid": "9fe5e340-ceaa-468a-8aff-e684a0b31e45", - "files": [ - ".cconb" - ], - "subMetas": {}, - "userData": { - "name": "skills" - } -} diff --git a/assets/resources/gui/gui/add.png b/assets/resources/gui/gui/add.png new file mode 100644 index 00000000..6b64ad1b Binary files /dev/null and b/assets/resources/gui/gui/add.png differ diff --git a/assets/resources/gui/gui/add.png.meta b/assets/resources/gui/gui/add.png.meta new file mode 100644 index 00000000..f4312094 --- /dev/null +++ b/assets/resources/gui/gui/add.png.meta @@ -0,0 +1,42 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "021c6b1c-3afb-4358-9945-265894801d46", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "021c6b1c-3afb-4358-9945-265894801d46@6c48a", + "displayName": "add", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "021c6b1c-3afb-4358-9945-265894801d46", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "texture", + "fixAlphaTransparencyArtifacts": false, + "redirect": "021c6b1c-3afb-4358-9945-265894801d46@6c48a" + } +} diff --git a/assets/resources/gui/gui/rund_bg.png b/assets/resources/gui/gui/rund_bg.png new file mode 100644 index 00000000..a2637ef8 Binary files /dev/null and b/assets/resources/gui/gui/rund_bg.png differ diff --git a/assets/resources/gui/gui/rund_bg.png.meta b/assets/resources/gui/gui/rund_bg.png.meta new file mode 100644 index 00000000..a37b6510 --- /dev/null +++ b/assets/resources/gui/gui/rund_bg.png.meta @@ -0,0 +1,42 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "9c55e80e-b560-43fc-b152-5057150fcd3c", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "9c55e80e-b560-43fc-b152-5057150fcd3c@6c48a", + "displayName": "rund_bg", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "9c55e80e-b560-43fc-b152-5057150fcd3c", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "texture", + "fixAlphaTransparencyArtifacts": false, + "redirect": "9c55e80e-b560-43fc-b152-5057150fcd3c@6c48a" + } +}