diff --git a/assets/resources/game/heros/knight/skeleton.atlas b/assets/resources/game/heros/knight/skeleton.atlas index 9b544b13..00ac90c2 100644 --- a/assets/resources/game/heros/knight/skeleton.atlas +++ b/assets/resources/game/heros/knight/skeleton.atlas @@ -1,208 +1,194 @@ skeleton.png -size: 567, 142 +size: 269, 269 format: RGBA8888 filter: Linear, Linear repeat: none Angry - rotate: true - xy: 522, 70 + rotate: false + xy: 234, 37 size: 28, 15 orig: 128, 128 offset: 59, 59 index: -1 EmberHarbinger - rotate: false - xy: 2, 14 + rotate: true + xy: 98, 142 size: 41, 126 orig: 128, 256 offset: 43, 38 index: -1 Eyes1 rotate: false - xy: 457, 2 + xy: 176, 18 size: 43, 16 orig: 128, 128 offset: 52, 74 index: -1 Eyes10 - rotate: true - xy: 97, 2 + rotate: false + xy: 123, 2 size: 42, 14 orig: 128, 128 offset: 53, 75 index: -1 Fluffy - rotate: true - xy: 45, 46 + rotate: false + xy: 2, 105 size: 94, 78 orig: 256, 256 offset: 83, 132 index: -1 -ShieldOfRagingCrux - rotate: true - xy: 222, 2 - size: 54, 58 - orig: 128, 128 - offset: 38, 36 - index: -1 body rotate: true - xy: 113, 4 + xy: 90, 29 size: 40, 49 orig: 40, 49 offset: 0, 0 index: -1 body2 - rotate: true - xy: 164, 5 + rotate: false + xy: 173, 84 size: 47, 56 orig: 47, 56 offset: 0, 0 index: -1 er rotate: false - xy: 539, 81 + xy: 243, 15 size: 15, 20 orig: 21, 20 offset: 0, 0 index: -1 eye rotate: true - xy: 457, 20 + xy: 216, 37 size: 45, 16 orig: 46, 16 offset: 1, 0 index: -1 eye2 - rotate: false - xy: 2, 2 + rotate: true + xy: 263, 147 size: 29, 4 orig: 128, 128 offset: 61, 81 index: -1 fa - rotate: true - xy: 125, 54 + rotate: false + xy: 2, 28 size: 86, 75 orig: 86, 75 offset: 0, 0 index: -1 hand3 - rotate: true - xy: 502, 2 + rotate: false + xy: 65, 2 size: 21, 24 orig: 21, 24 offset: 0, 0 index: -1 head - rotate: false - xy: 435, 67 + rotate: true + xy: 98, 71 size: 69, 73 orig: 69, 73 offset: 0, 0 index: -1 hl rotate: false - xy: 475, 25 + xy: 235, 227 size: 32, 40 orig: 32, 40 offset: 0, 0 index: -1 hl2 rotate: false - xy: 405, 10 + xy: 141, 23 size: 33, 46 orig: 33, 46 offset: 0, 0 index: -1 hr rotate: true - xy: 530, 103 + xy: 226, 146 size: 37, 35 orig: 37, 35 offset: 0, 0 index: -1 hr2 rotate: false - xy: 365, 10 + xy: 176, 36 size: 38, 46 orig: 38, 46 offset: 0, 0 index: -1 ll - rotate: false - xy: 533, 35 + rotate: true + xy: 88, 2 size: 19, 33 orig: 20, 33 offset: 0, 0 index: -1 ll2 rotate: false - xy: 506, 100 + xy: 235, 185 size: 22, 40 orig: 22, 40 offset: 0, 0 index: -1 ll3 rotate: false - xy: 51, 2 + xy: 222, 98 size: 21, 42 orig: 21, 42 offset: 0, 0 index: -1 lr - rotate: true - xy: 528, 5 + rotate: false + xy: 221, 2 size: 20, 33 orig: 20, 33 offset: 0, 0 index: -1 lr2 rotate: false - xy: 509, 27 + xy: 245, 104 size: 22, 40 orig: 22, 40 offset: 0, 0 index: -1 lr3 rotate: false - xy: 74, 2 + xy: 234, 54 size: 21, 42 orig: 21, 42 offset: 0, 0 index: -1 mei - rotate: false - xy: 2, 8 + rotate: true + xy: 263, 178 size: 47, 4 orig: 47, 6 offset: 0, 1 index: -1 tx rotate: false - xy: 202, 58 + xy: 2, 185 size: 231, 82 orig: 235, 86 offset: 2, 2 index: -1 -tx_huo - rotate: true - xy: 282, 4 - size: 52, 81 - orig: 59, 85 - offset: 4, 2 - index: -1 ying_zi - rotate: true - xy: 440, 4 + rotate: false + xy: 2, 11 size: 61, 15 orig: 63, 17 offset: 1, 1 index: -1 zui - rotate: true - xy: 506, 69 + rotate: false + xy: 167, 2 size: 29, 14 orig: 29, 15 offset: 0, 0 diff --git a/assets/resources/game/heros/knight/skeleton.json b/assets/resources/game/heros/knight/skeleton.json index d94cb73e..d746b7fd 100644 --- a/assets/resources/game/heros/knight/skeleton.json +++ b/assets/resources/game/heros/knight/skeleton.json @@ -1,11 +1,11 @@ { "skeleton": { - "hash": "dy6XnZ8XLvE", + "hash": "1jCx2pU9lGA", "spine": "3.8-from-4.0-from-4.1-from-4.2.35", "x": -251.3, "y": -119.77, - "width": 512, - "height": 512, + "width": 706.01, + "height": 519.51, "images": "./images/", "audio": "./audio" }, @@ -41,11 +41,11 @@ ], "slots": [ { "name": "ying_zi", "bone": "showder", "attachment": "ying_zi" }, + { "name": "ShieldOfRagingCrux", "bone": "weapon2", "attachment": "EmberHarbinger" }, { "name": "hr", "bone": "hr", "attachment": "hr2" }, { "name": "lr", "bone": "lr", "attachment": "lr3" }, { "name": "ll", "bone": "ll", "attachment": "ll3" }, { "name": "body", "bone": "bone", "attachment": "body2" }, - { "name": "ShieldOfRagingCrux", "bone": "weapon2", "attachment": "ShieldOfRagingCrux" }, { "name": "hl", "bone": "hl", "attachment": "hl2" }, { "name": "head", "bone": "head", "attachment": "head" }, { "name": "mei", "bone": "head", "attachment": "mei" }, @@ -53,8 +53,8 @@ { "name": "eye", "bone": "head", "attachment": "Eyes10" }, { "name": "fa", "bone": "head", "attachment": "Fluffy" }, { "name": "er", "bone": "head", "attachment": "er" }, - { "name": "EmberHarbinger", "bone": "weapon", "attachment": "EmberHarbinger" }, - { "name": "tx", "bone": "hand", "color": "ffffff5b", "attachment": "tx_huo" }, + { "name": "EmberHarbinger", "bone": "weapon" }, + { "name": "tx", "bone": "hand", "color": "ffffff5b" }, { "name": "hand3", "bone": "hand", "attachment": "hand3" }, { "name": "tx2", "bone": "tx", "color": "ffffff00", "attachment": "tx" } ], @@ -66,17 +66,6 @@ "body": { "x": 34.27, "y": 4.7, "rotation": -88.79, "width": 80, "height": 98 }, "body2": { "x": 23.39, "rotation": -88.79, "width": 94, "height": 112 } }, - "EmberHarbinger": { - "EmberHarbinger": { - "x": 131.06, - "y": -4.35, - "scaleX": 0.7, - "scaleY": 0.7, - "rotation": -91.25, - "width": 256, - "height": 512 - } - }, "er": { "er": { "x": 23.57, "y": 55.92, "rotation": -83.46, "width": 41, "height": 40 } }, @@ -208,18 +197,7 @@ "mei": { "x": 55.25, "y": -7.64, "rotation": -83.46, "width": 93, "height": 11 } }, "ShieldOfRagingCrux": { - "ShieldOfRagingCrux": { "x": 49.38, "y": -16.89, "rotation": -41.35, "width": 256, "height": 256 } - }, - "tx": { - "tx_huo": { - "x": 101.43, - "y": 8.31, - "scaleX": 0.614, - "scaleY": 1.342, - "rotation": -77.44, - "width": 118, - "height": 169 - } + "EmberHarbinger": { "x": 153.28, "y": -23.23, "rotation": -98.97, "width": 256, "height": 512 } }, "tx2": { "tx": { @@ -256,16 +234,16 @@ "hl": { "rotate": [ {}, - { "time": 0.4333, "angle": 128.13 }, - { "time": 0.5333, "angle": 135.83 }, + { "time": 0.4333, "angle": -35.3 }, + { "time": 0.5333, "angle": -54.04 }, { "time": 0.6667 } ] }, "bone9": { "rotate": [ {}, - { "time": 0.4333, "angle": 37.61, "curve": "stepped" }, - { "time": 0.5333, "angle": 37.61 }, + { "time": 0.4333, "angle": -37.34 }, + { "time": 0.5333, "angle": -45.58 }, { "time": 0.6667 } ] }, @@ -316,8 +294,21 @@ "hr": { "rotate": [ {}, - { "time": 0.4333, "angle": -10.2, "curve": "stepped" }, - { "time": 0.5333, "angle": -10.2 }, + { "time": 0.4333, "angle": 92.04 }, + { "time": 0.5333, "angle": 119.1 }, + { "time": 0.6333, "angle": -0.53 }, + { "time": 0.6667 } + ] + }, + "bone13": { + "rotate": [ + { "time": 0.4333 } + ] + }, + "bone12": { + "rotate": [ + { "time": 0.5667 }, + { "time": 0.6333, "angle": -15 }, { "time": 0.6667 } ] } diff --git a/assets/resources/game/heros/knight/skeleton.png b/assets/resources/game/heros/knight/skeleton.png index 3846228b..18561de2 100644 Binary files a/assets/resources/game/heros/knight/skeleton.png and b/assets/resources/game/heros/knight/skeleton.png differ diff --git a/assets/resources/game/monster/boss/boss4/skeleton.json b/assets/resources/game/monster/boss/boss4/skeleton.json index 606a7cb6..ffe1b717 100644 --- a/assets/resources/game/monster/boss/boss4/skeleton.json +++ b/assets/resources/game/monster/boss/boss4/skeleton.json @@ -1,11 +1,11 @@ { "skeleton": { - "hash": "L5XzpK41SU8", + "hash": "2pV66Fng3Ow", "spine": "3.8-from-4.0-from-4.1-from-4.2.35", "x": -263.04, - "y": -189.55, - "width": 603.21, - "height": 586.36, + "y": -181.52, + "width": 726.84, + "height": 578.33, "images": "./images/", "audio": "./audio" }, @@ -47,7 +47,7 @@ { "name": "Skeleton1-2", "bone": "hr", "attachment": "kl/Skeleton1-2" }, { "name": "hr", "bone": "hr", "attachment": "kl/SkeletonKing-1" }, { "name": "Skeleton1-4", "bone": "bone13", "attachment": "kl/Skeleton1-4" }, - { "name": "ShieldOfRagingCrux", "bone": "weapon2" }, + { "name": "ShieldOfRagingCrux", "bone": "weapon2", "attachment": "kl/CaneOfTSummoner" }, { "name": "lr", "bone": "lr", "attachment": "kl/Skeleton1-91" }, { "name": "ll", "bone": "ll" }, { "name": "Skeleton1-10", "bone": "bone5", "attachment": "kl/Skeleton1-10" }, @@ -64,7 +64,7 @@ { "name": "eye", "bone": "head", "attachment": "kl/Skeleton1Eyes" }, { "name": "fa", "bone": "head" }, { "name": "er", "bone": "head" }, - { "name": "EmberHarbinger", "bone": "weapon", "attachment": "kl/CaneOfTSummoner" }, + { "name": "EmberHarbinger", "bone": "weapon" }, { "name": "tx", "bone": "hand", "color": "ffffff5b" }, { "name": "Skeleton1-3", "bone": "bone9", "attachment": "kl/Skeleton1-3" }, { "name": "hand3", "bone": "hand", "attachment": "kl/Skeleton1-6" }, @@ -80,9 +80,6 @@ "body2": { "x": 23.39, "rotation": -88.79, "width": 94, "height": 112 }, "kl/Skeleton1-0": { "x": 43.71, "y": 8.14, "rotation": -88.79, "width": 82, "height": 69 } }, - "EmberHarbinger": { - "kl/CaneOfTSummoner": { "x": 163.46, "y": 28.29, "rotation": -80.08, "width": 256, "height": 512 } - }, "er": { "er": { "x": 23.57, "y": 55.92, "rotation": -83.46, "width": 41, "height": 40 } }, @@ -229,6 +226,9 @@ "mei": { "mei": { "x": 55.25, "y": -7.64, "rotation": -83.46, "width": 93, "height": 11 } }, + "ShieldOfRagingCrux": { + "kl/CaneOfTSummoner": { "x": 152.96, "y": -4.71, "rotation": -94.94, "width": 256, "height": 512 } + }, "Skeleton1-2": { "kl/Skeleton1-2": { "x": 3.33, "rotation": 53.88, "width": 37, "height": 42 } }, @@ -287,16 +287,16 @@ "hl": { "rotate": [ {}, - { "time": 0.4333, "angle": 128.13 }, - { "time": 0.5333, "angle": 135.83 }, + { "time": 0.4333, "angle": -36.55 }, + { "time": 0.5333, "angle": -67.33 }, { "time": 0.6667 } ] }, "bone9": { "rotate": [ {}, - { "time": 0.4333, "angle": 37.61, "curve": "stepped" }, - { "time": 0.5333, "angle": 37.61 }, + { "time": 0.4333, "angle": -12.86 }, + { "time": 0.5333, "angle": -3.46 }, { "time": 0.6667 } ] }, @@ -347,8 +347,23 @@ "hr": { "rotate": [ {}, - { "time": 0.4333, "angle": -10.2, "curve": "stepped" }, - { "time": 0.5333, "angle": -10.2 }, + { "time": 0.4333, "angle": 92.06 }, + { "time": 0.5333, "angle": 117.21 }, + { "time": 0.6333, "angle": 29.3 }, + { "time": 0.6667 } + ] + }, + "bone12": { + "rotate": [ + { "time": 0.5333 }, + { "time": 0.6, "angle": -27.3 }, + { "time": 0.6667 } + ] + }, + "bone13": { + "rotate": [ + { "time": 0.5333 }, + { "time": 0.6, "angle": -56.01 }, { "time": 0.6667 } ] }