diff --git a/assets/resources/game/heros/top.prefab b/assets/resources/game/heros/top.prefab index b5387e47..633d364c 100644 --- a/assets/resources/game/heros/top.prefab +++ b/assets/resources/game/heros/top.prefab @@ -100,7 +100,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 4.463, + "y": -11.989, "z": 0 }, "_lrot": { @@ -112,7 +112,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.1, + "x": 0.9, "y": 1, "z": 1 }, @@ -428,7 +428,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 10.531, + "y": -5.921, "z": 0 }, "_lrot": { @@ -440,8 +440,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.0000000000000002, - "y": 1.0000000000000002, + "x": 0.8, + "y": 0.8, "z": 1 }, "_mobility": 0, @@ -6861,7 +6861,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -21.65, - "y": 3.598, + "y": -12.854, "z": 0 }, "_lrot": { @@ -7250,8 +7250,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": 3.852, + "y": -16.452, "z": 0 }, "_lrot": { diff --git a/assets/resources/game/skills/skills.plist b/assets/resources/game/skills/skills.plist index e43a12d9..3572ff8f 100644 --- a/assets/resources/game/skills/skills.plist +++ b/assets/resources/game/skills/skills.plist @@ -17,9 +17,9 @@ spriteSourceSize {160,48} textureRect - {{645,464},{150,36}} + {{536,404},{150,36}} textureRotated - + Arrow2.png @@ -34,7 +34,7 @@ spriteSourceSize {160,48} textureRect - {{639,930},{150,36}} + {{688,416},{150,36}} textureRotated @@ -51,7 +51,7 @@ spriteSourceSize {102,102} textureRect - {{926,932},{82,96}} + {{831,995},{82,96}} textureRotated @@ -68,9 +68,9 @@ spriteSourceSize {102,102} textureRect - {{830,1504},{80,96}} + {{1854,255},{80,96}} textureRotated - + Bonfire_loop_03.png @@ -85,9 +85,9 @@ spriteSourceSize {102,102} textureRect - {{822,1280},{78,98}} + {{1862,68},{78,98}} textureRotated - + Bonfire_loop_04.png @@ -102,7 +102,7 @@ spriteSourceSize {102,102} textureRect - {{284,1692},{74,84}} + {{1511,139},{74,84}} textureRotated @@ -119,9 +119,9 @@ spriteSourceSize {102,102} textureRect - {{1024,935},{76,88}} + {{1448,801},{76,88}} textureRotated - + Bonfire_loop_06.png @@ -136,9 +136,9 @@ spriteSourceSize {102,102} textureRect - {{865,1801},{76,90}} + {{1952,239},{76,90}} textureRotated - + Bonfire_loop_07.png @@ -153,9 +153,9 @@ spriteSourceSize {102,102} textureRect - {{871,1893},{76,92}} + {{1597,72},{76,92}} textureRotated - + Bonfire_loop_08.png @@ -170,9 +170,9 @@ spriteSourceSize {102,102} textureRect - {{764,1070},{80,94}} + {{1562,511},{80,94}} textureRotated - + Fireball_2_blue_00.png @@ -187,7 +187,7 @@ spriteSourceSize {184,61} textureRect - {{438,1373},{174,51}} + {{483,247},{174,51}} textureRotated @@ -204,9 +204,9 @@ spriteSourceSize {184,61} textureRect - {{438,1549},{138,51}} + {{1283,547},{138,51}} textureRotated - + Fireball_2_blue_02.png @@ -221,7 +221,7 @@ spriteSourceSize {184,61} textureRect - {{781,1504},{142,47}} + {{799,600},{142,47}} textureRotated @@ -238,9 +238,9 @@ spriteSourceSize {184,61} textureRect - {{438,1549},{138,51}} + {{1283,547},{138,51}} textureRotated - + Fireball_2_loop_01.png @@ -255,9 +255,9 @@ spriteSourceSize {102,102} textureRect - {{834,1749},{84,50}} + {{1416,600},{84,50}} textureRotated - + Fireball_2_loop_02.png @@ -272,7 +272,7 @@ spriteSourceSize {102,102} textureRect - {{927,1424},{88,46}} + {{1927,612},{88,46}} textureRotated @@ -289,9 +289,9 @@ spriteSourceSize {102,102} textureRect - {{997,1801},{90,46}} + {{1952,371},{90,46}} textureRotated - + Fireball_2_loop_04.png @@ -306,9 +306,9 @@ spriteSourceSize {102,102} textureRect - {{943,1801},{90,52}} + {{1952,317},{90,52}} textureRotated - + Flame_Side_01.png @@ -323,7 +323,7 @@ spriteSourceSize {154,154} textureRect - {{1020,600},{58,28}} + {{1979,953},{58,28}} textureRotated @@ -340,7 +340,7 @@ spriteSourceSize {154,154} textureRect - {{281,1939},{96,54}} + {{1633,698},{96,54}} textureRotated @@ -357,7 +357,7 @@ spriteSourceSize {154,154} textureRect - {{718,1240},{118,102}} + {{1222,686},{118,102}} textureRotated @@ -374,9 +374,9 @@ spriteSourceSize {154,154} textureRect - {{1059,1},{122,120}} + {{675,666},{122,120}} textureRotated - + Flame_Side_05.png @@ -391,9 +391,9 @@ spriteSourceSize {154,154} textureRect - {{464,1927},{118,120}} + {{848,621},{118,120}} textureRotated - + Flame_Side_06.png @@ -408,7 +408,7 @@ spriteSourceSize {154,154} textureRect - {{1051,282},{118,114}} + {{1102,686},{118,114}} textureRotated @@ -425,9 +425,9 @@ spriteSourceSize {154,154} textureRect - {{602,1240},{114,118}} + {{1312,321},{114,118}} textureRotated - + Flame_Side_08.png @@ -442,7 +442,7 @@ spriteSourceSize {154,154} textureRect - {{663,1768},{116,114}} + {{1326,686},{116,114}} textureRotated @@ -459,9 +459,9 @@ spriteSourceSize {154,154} textureRect - {{171,1241},{104,116}} + {{875,877},{104,116}} textureRotated - + Flame_Side_10.png @@ -476,7 +476,7 @@ spriteSourceSize {154,154} textureRect - {{344,1937},{108,118}} + {{1303,437},{108,118}} textureRotated @@ -493,7 +493,7 @@ spriteSourceSize {154,154} textureRect - {{661,1658},{108,116}} + {{1208,897},{108,116}} textureRotated @@ -510,9 +510,9 @@ spriteSourceSize {154,154} textureRect - {{813,821},{100,114}} + {{1942,123},{100,114}} textureRotated - + Flame_Side_13.png @@ -527,9 +527,9 @@ spriteSourceSize {154,154} textureRect - {{929,822},{94,108}} + {{1098,897},{94,108}} textureRotated - + Flame_Side_14.png @@ -544,7 +544,7 @@ spriteSourceSize {154,154} textureRect - {{834,1653},{80,94}} + {{1955,516},{80,94}} textureRotated @@ -561,9 +561,9 @@ spriteSourceSize {205,205} textureRect - {{628,936},{25,9}} + {{1838,1068},{25,9}} textureRotated - + Flame_ellipse_02.png @@ -578,7 +578,7 @@ spriteSourceSize {205,205} textureRect - {{778,968},{75,33}} + {{1997,660},{75,33}} textureRotated @@ -595,7 +595,7 @@ spriteSourceSize {205,205} textureRect - {{939,1129},{119,53}} + {{1834,521},{119,53}} textureRotated @@ -612,7 +612,7 @@ spriteSourceSize {205,205} textureRect - {{271,1768},{169,71}} + {{421,690},{169,71}} textureRotated @@ -629,7 +629,7 @@ spriteSourceSize {205,205} textureRect - {{457,936},{169,69}} + {{999,363},{169,69}} textureRotated @@ -646,9 +646,9 @@ spriteSourceSize {205,205} textureRect - {{344,1768},{167,63}} + {{1,1014},{167,63}} textureRotated - + Flame_ellipse_07.png @@ -663,7 +663,7 @@ spriteSourceSize {205,205} textureRect - {{502,692},{167,57}} + {{1691,91},{167,57}} textureRotated @@ -680,9 +680,9 @@ spriteSourceSize {205,205} textureRect - {{779,1658},{141,53}} + {{494,806},{141,53}} textureRotated - + Flame_ellipse_09.png @@ -697,9 +697,9 @@ spriteSourceSize {205,205} textureRect - {{1023,1893},{107,13}} + {{1432,321},{107,13}} textureRotated - + Flame_vertical_3_loop_01.png @@ -714,9 +714,9 @@ spriteSourceSize {154,154} textureRect - {{654,243},{70,140}} + {{1184,1007},{70,140}} textureRotated - + Flame_vertical_3_loop_03.png @@ -731,7 +731,7 @@ spriteSourceSize {154,154} textureRect - {{597,1166},{72,142}} + {{1139,538},{72,142}} textureRotated @@ -748,7 +748,7 @@ spriteSourceSize {154,154} textureRect - {{726,370},{70,140}} + {{1597,150},{70,140}} textureRotated @@ -765,7 +765,7 @@ spriteSourceSize {154,154} textureRect - {{732,538},{72,142}} + {{677,911},{72,142}} textureRotated @@ -782,7 +782,7 @@ spriteSourceSize {154,154} textureRect - {{829,637},{70,140}} + {{1597,222},{70,140}} textureRotated @@ -799,7 +799,7 @@ spriteSourceSize {154,154} textureRect - {{868,464},{72,142}} + {{1140,612},{72,142}} textureRotated @@ -816,9 +816,9 @@ spriteSourceSize {154,154} textureRect - {{971,637},{70,140}} + {{1490,437},{70,140}} textureRotated - + Flame_vertical_3_loop_15.png @@ -833,7 +833,7 @@ spriteSourceSize {154,154} textureRect - {{876,538},{72,142}} + {{981,804},{72,142}} textureRotated @@ -844,13 +844,13 @@ anchor {0.5,0.5} spriteOffset - {6,-3} + {3,-1} spriteSize - {85,84} + {53,53} spriteSourceSize - {229,212} + {137,127} textureRect - {{927,1338},{85,84}} + {{1982,863},{53,53}} textureRotated @@ -861,15 +861,15 @@ anchor {0.5,0.5} spriteOffset - {6,-5} + {3,-3} spriteSize - {101,92} + {63,57} spriteSourceSize - {229,212} + {137,127} textureRect - {{725,612},{101,92}} + {{1435,1014},{63,57}} textureRotated - + Fx05_04.png @@ -878,15 +878,15 @@ anchor {0.5,0.5} spriteOffset - {5,-1} + {3,-1} spriteSize - {119,110} + {73,67} spriteSourceSize - {229,212} + {137,127} textureRect - {{813,709},{119,110}} + {{1769,873},{73,67}} textureRotated - + Fx05_06.png @@ -895,15 +895,15 @@ anchor {0.5,0.5} spriteOffset - {3,3} + {2,2} spriteSize - {157,152} + {95,93} spriteSourceSize - {229,212} + {137,127} textureRect - {{409,1768},{157,152}} + {{1125,802},{95,93}} textureRotated - + Fx05_08.png @@ -912,15 +912,15 @@ anchor {0.5,0.5} spriteOffset - {2,3} + {1,2} spriteSize - {177,172} + {107,105} spriteSourceSize - {229,212} + {137,127} textureRect - {{639,751},{177,172}} + {{1725,441},{107,105}} textureRotated - + Fx05_10.png @@ -929,15 +929,15 @@ anchor {0.5,0.5} spriteOffset - {2,3} + {1,2} spriteSize - {183,180} + {111,109} spriteSourceSize - {229,212} + {137,127} textureRect - {{457,751},{183,180}} + {{1545,294},{111,109}} textureRotated - + Fx05_12.png @@ -946,13 +946,13 @@ anchor {0.5,0.5} spriteOffset - {1,2} + {1,1} spriteSize - {189,186} + {115,113} spriteSourceSize - {229,212} + {137,127} textureRect - {{260,947},{189,186}} + {{981,878},{115,113}} textureRotated @@ -963,13 +963,13 @@ anchor {0.5,0.5} spriteOffset - {1,2} + {0,1} spriteSize - {195,194} + {119,117} spriteSourceSize - {229,212} + {137,127} textureRect - {{260,751},{195,194}} + {{981,685},{119,117}} textureRotated @@ -980,13 +980,13 @@ anchor {0.5,0.5} spriteOffset - {1,1} + {0,1} spriteSize - {201,200} + {123,121} spriteSourceSize - {229,212} + {137,127} textureRect - {{301,489},{201,200}} + {{554,861},{123,121}} textureRotated @@ -997,15 +997,15 @@ anchor {0.5,0.5} spriteOffset - {0,1} + {0,0} spriteSize - {207,208} + {125,125} spriteSourceSize - {229,212} + {137,127} textureRect - {{74,1559},{207,208}} + {{494,679},{125,125}} textureRotated - + Fx05_19.png @@ -1016,11 +1016,11 @@ spriteOffset {0,0} spriteSize - {209,210} + {127,127} spriteSourceSize - {229,212} + {137,127} textureRect - {{74,1347},{209,210}} + {{425,861},{127,127}} textureRotated @@ -1037,7 +1037,7 @@ spriteSourceSize {171,155} textureRect - {{1008,1738},{51,53}} + {{1785,1022},{51,53}} textureRotated @@ -1054,9 +1054,9 @@ spriteSourceSize {171,155} textureRect - {{939,1016},{111,103}} + {{1726,336},{111,103}} textureRotated - + Hit_1_blue_02.png @@ -1071,7 +1071,7 @@ spriteSourceSize {171,155} textureRect - {{868,254},{113,115}} + {{1326,897},{113,115}} textureRotated @@ -1088,7 +1088,7 @@ spriteSourceSize {171,155} textureRect - {{483,1240},{117,121}} + {{677,788},{117,121}} textureRotated @@ -1105,9 +1105,9 @@ spriteSourceSize {171,155} textureRect - {{450,1689},{77,121}} + {{796,788},{77,121}} textureRotated - + Hit_1_normal_00.png @@ -1122,9 +1122,9 @@ spriteSourceSize {228,207} textureRect - {{654,385},{70,69}} + {{1841,778},{70,69}} textureRotated - + Hit_1_normal_01.png @@ -1139,7 +1139,7 @@ spriteSourceSize {228,207} textureRect - {{506,243},{146,135}} + {{999,226},{146,135}} textureRotated @@ -1156,9 +1156,9 @@ spriteSourceSize {228,207} textureRect - {{285,1542},{148,151}} + {{849,260},{148,151}} textureRotated - + Hit_1_normal_03.png @@ -1173,7 +1173,7 @@ spriteSourceSize {228,207} textureRect - {{491,1363},{154,159}} + {{536,243},{154,159}} textureRotated @@ -1190,7 +1190,7 @@ spriteSourceSize {228,207} textureRect - {{451,1007},{102,161}} + {{1147,226},{102,161}} textureRotated @@ -1207,9 +1207,9 @@ spriteSourceSize {113,113} textureRect - {{1084,1971},{33,41}} + {{479,638},{33,41}} textureRotated - + Hit_3_normal_01.png @@ -1224,9 +1224,9 @@ spriteSourceSize {113,113} textureRect - {{928,1184},{83,95}} + {{1952,419},{83,95}} textureRotated - + Hit_3_normal_02.png @@ -1241,9 +1241,9 @@ spriteSourceSize {113,113} textureRect - {{823,1183},{95,103}} + {{1561,593},{95,103}} textureRotated - + Hit_3_normal_03.png @@ -1258,9 +1258,9 @@ spriteSourceSize {113,113} textureRect - {{1080,513},{99,111}} + {{1432,336},{99,111}} textureRotated - + Hit_3_normal_04.png @@ -1275,7 +1275,7 @@ spriteSourceSize {113,113} textureRect - {{1088,398},{91,113}} + {{1442,686},{91,113}} textureRotated @@ -1292,9 +1292,9 @@ spriteSourceSize {113,113} textureRect - {{750,2015},{25,35}} + {{1618,940},{25,35}} textureRotated - + Horisontal_Slash_1_blue_00.png @@ -1309,9 +1309,9 @@ spriteSourceSize {215,25} textureRect - {{1121,1464},{61,17}} + {{983,201},{61,17}} textureRotated - + Horisontal_Slash_1_blue_01.png @@ -1326,9 +1326,9 @@ spriteSourceSize {215,25} textureRect - {{829,612},{141,23}} + {{1658,549},{141,23}} textureRotated - + Horisontal_Slash_1_blue_02.png @@ -1343,9 +1343,9 @@ spriteSourceSize {215,25} textureRect - {{483,247},{169,21}} + {{1691,68},{169,21}} textureRotated - + Horisontal_Slash_1_blue_03.png @@ -1360,7 +1360,7 @@ spriteSourceSize {215,25} textureRect - {{238,1002},{115,15}} + {{1441,897},{115,15}} textureRotated @@ -1377,7 +1377,7 @@ spriteSourceSize {215,25} textureRect - {{51,1901},{51,15}} + {{968,621},{51,15}} textureRotated @@ -1394,7 +1394,7 @@ spriteSourceSize {215,25} textureRect - {{1124,1168},{23,13}} + {{1723,646},{23,13}} textureRotated @@ -1411,7 +1411,7 @@ spriteSourceSize {85,86} textureRect - {{573,1681},{85,86}} + {{1854,168},{85,86}} textureRotated @@ -1428,9 +1428,9 @@ spriteSourceSize {84,80} textureRect - {{1078,1269},{76,80}} + {{1494,997},{76,80}} textureRotated - + Magic_Sphere_normal_01.png @@ -1445,9 +1445,9 @@ spriteSourceSize {84,80} textureRect - {{370,1692},{78,74}} + {{1693,953},{78,74}} textureRotated - + Magic_Sphere_normal_02.png @@ -1462,7 +1462,7 @@ spriteSourceSize {84,80} textureRect - {{916,1663},{84,76}} + {{1106,993},{84,76}} textureRotated @@ -1479,9 +1479,9 @@ spriteSourceSize {84,80} textureRect - {{1078,1183},{84,76}} + {{1511,215},{84,76}} textureRotated - + Magic_Sphere_normal_04.png @@ -1496,7 +1496,7 @@ spriteSourceSize {84,80} textureRect - {{1062,1672},{76,76}} + {{1691,875},{76,76}} textureRotated @@ -1513,9 +1513,9 @@ spriteSourceSize {84,80} textureRect - {{645,616},{74,78}} + {{1691,795},{74,78}} textureRotated - + Magic_Sphere_normal_06.png @@ -1530,9 +1530,9 @@ spriteSourceSize {84,80} textureRect - {{1103,1347},{76,80}} + {{1833,650},{76,80}} textureRotated - + Magic_Sphere_normal_07.png @@ -1547,7 +1547,7 @@ spriteSourceSize {84,80} textureRect - {{741,1166},{72,80}} + {{1915,660},{72,80}} textureRotated @@ -1564,7 +1564,7 @@ spriteSourceSize {110,110} textureRect - {{372,1135},{104,94}} + {{1562,405},{104,94}} textureRotated @@ -1581,7 +1581,7 @@ spriteSourceSize {104,104} textureRect - {{663,1886},{28,22}} + {{1362,94},{28,22}} textureRotated @@ -1598,7 +1598,7 @@ spriteSourceSize {104,104} textureRect - {{830,2014},{36,24}} + {{831,967},{36,24}} textureRotated @@ -1615,9 +1615,9 @@ spriteSourceSize {104,104} textureRect - {{1124,1593},{60,44}} + {{1689,749},{60,44}} textureRotated - + Teleport_normal_03.png @@ -1632,9 +1632,9 @@ spriteSourceSize {104,104} textureRect - {{1124,1100},{66,46}} + {{1911,907},{66,46}} textureRotated - + Teleport_normal_04.png @@ -1649,9 +1649,9 @@ spriteSourceSize {104,104} textureRect - {{1014,1347},{72,76}} + {{1767,795},{72,76}} textureRotated - + Teleport_normal_05.png @@ -1666,9 +1666,9 @@ spriteSourceSize {104,104} textureRect - {{949,1893},{72,92}} + {{1833,576},{72,92}} textureRotated - + Teleport_normal_06.png @@ -1683,7 +1683,7 @@ spriteSourceSize {104,104} textureRect - {{1044,1013},{70,104}} + {{1458,891},{70,104}} textureRotated @@ -1700,7 +1700,7 @@ spriteSourceSize {104,104} textureRect - {{1116,977},{62,86}} + {{1689,661},{62,86}} textureRotated @@ -1717,7 +1717,7 @@ spriteSourceSize {104,104} textureRect - {{920,1749},{50,86}} + {{1530,940},{50,86}} textureRotated @@ -1734,7 +1734,7 @@ spriteSourceSize {104,104} textureRect - {{1017,1421},{48,84}} + {{1813,728},{48,84}} textureRotated @@ -1751,9 +1751,9 @@ spriteSourceSize {104,104} textureRect - {{1082,1789},{48,64}} + {{1901,955},{48,64}} textureRotated - + Teleport_normal_11.png @@ -1768,7 +1768,7 @@ spriteSourceSize {104,104} textureRect - {{201,1002},{10,30}} + {{637,849},{10,30}} textureRotated @@ -1785,9 +1785,9 @@ spriteSourceSize {129,97} textureRect - {{688,1886},{127,87}} + {{297,990},{127,87}} textureRotated - + Uzi_blue_01.png @@ -1802,9 +1802,9 @@ spriteSourceSize {129,97} textureRect - {{1116,626},{125,63}} + {{170,1014},{125,63}} textureRotated - + Uzi_blue_02.png @@ -1819,7 +1819,7 @@ spriteSourceSize {129,97} textureRect - {{1114,862},{113,65}} + {{1658,434},{113,65}} textureRotated @@ -1836,7 +1836,7 @@ spriteSourceSize {129,97} textureRect - {{983,403},{103,59}} + {{1535,796},{103,59}} textureRotated @@ -1853,9 +1853,9 @@ spriteSourceSize {129,97} textureRect - {{1116,753},{107,63}} + {{1326,1014},{107,63}} textureRotated - + Uzi_blue_05.png @@ -1870,9 +1870,9 @@ spriteSourceSize {129,97} textureRect - {{928,1269},{95,67}} + {{1723,549},{95,67}} textureRotated - + Uzi_blue_06.png @@ -1887,9 +1887,9 @@ spriteSourceSize {129,97} textureRect - {{933,1987},{87,55}} + {{539,990},{87,55}} textureRotated - + Uzi_blue_07.png @@ -1904,9 +1904,9 @@ spriteSourceSize {129,97} textureRect - {{1116,753},{107,63}} + {{1326,1014},{107,63}} textureRotated - + Vertical_Vortex_blue_00.png @@ -1921,7 +1921,7 @@ spriteSourceSize {39,93} textureRect - {{1121,1527},{13,17}} + {{1362,124},{13,17}} textureRotated @@ -1938,9 +1938,9 @@ spriteSourceSize {39,93} textureRect - {{787,2014},{25,41}} + {{2017,612},{25,41}} textureRotated - + Vertical_Vortex_blue_02.png @@ -1955,7 +1955,7 @@ spriteSourceSize {39,93} textureRect - {{234,704},{33,61}} + {{1979,918},{33,61}} textureRotated @@ -1972,9 +1972,9 @@ spriteSourceSize {39,93} textureRect - {{725,706},{39,85}} + {{1572,992},{39,85}} textureRotated - + Vertical_Vortex_blue_04.png @@ -1989,9 +1989,9 @@ spriteSourceSize {39,93} textureRect - {{1033,1471},{39,85}} + {{1613,992},{39,85}} textureRotated - + Vertical_Vortex_blue_05.png @@ -2006,9 +2006,9 @@ spriteSourceSize {39,93} textureRect - {{1037,1596},{37,85}} + {{1753,646},{37,85}} textureRotated - + Vertical_Vortex_blue_06.png @@ -2023,9 +2023,9 @@ spriteSourceSize {39,93} textureRect - {{1037,1635},{35,85}} + {{1654,893},{35,85}} textureRotated - + Vertical_Vortex_blue_07.png @@ -2040,9 +2040,9 @@ spriteSourceSize {39,93} textureRect - {{1132,1789},{33,71}} + {{1838,916},{33,71}} textureRotated - + Vertical_Vortex_blue_08.png @@ -2057,7 +2057,7 @@ spriteSourceSize {39,93} textureRect - {{100,1319},{15,55}} + {{1454,272},{15,55}} textureRotated @@ -2074,9 +2074,9 @@ spriteSourceSize {39,93} textureRect - {{451,1111},{15,19}} + {{692,243},{15,19}} textureRotated - + Vertical_Vortex_normal_01.png @@ -2091,9 +2091,9 @@ spriteSourceSize {39,93} textureRect - {{972,612},{23,41}} + {{1615,857},{23,41}} textureRotated - + Vertical_Vortex_normal_02.png @@ -2108,9 +2108,9 @@ spriteSourceSize {39,93} textureRect - {{1116,1065},{33,63}} + {{483,423},{33,63}} textureRotated - + Vertical_Vortex_normal_03.png @@ -2125,7 +2125,7 @@ spriteSourceSize {39,93} textureRect - {{1038,1893},{39,85}} + {{1792,548},{39,85}} textureRotated @@ -2142,7 +2142,7 @@ spriteSourceSize {39,93} textureRect - {{1140,1464},{39,85}} + {{1792,635},{39,85}} textureRotated @@ -2159,9 +2159,9 @@ spriteSourceSize {39,93} textureRect - {{1061,1750},{37,85}} + {{1654,980},{37,85}} textureRotated - + Vertical_Vortex_normal_06.png @@ -2176,9 +2176,9 @@ spriteSourceSize {39,93} textureRect - {{1045,1793},{35,85}} + {{1899,734},{35,85}} textureRotated - + Vertical_Vortex_normal_07.png @@ -2193,9 +2193,9 @@ spriteSourceSize {39,93} textureRect - {{1103,1429},{33,73}} + {{2008,983},{33,73}} textureRotated - + Vertical_Vortex_normal_08.png @@ -2210,9 +2210,9 @@ spriteSourceSize {39,93} textureRect - {{483,418},{15,55}} + {{1454,289},{15,55}} textureRotated - + Water_Splash_03_00.png @@ -2227,7 +2227,7 @@ spriteSourceSize {154,154} textureRect - {{688,2015},{30,60}} + {{1982,831},{30,60}} textureRotated @@ -2244,9 +2244,9 @@ spriteSourceSize {154,154} textureRect - {{1079,1901},{42,68}} + {{799,744},{42,68}} textureRotated - + Water_Splash_03_02.png @@ -2261,9 +2261,9 @@ spriteSourceSize {154,154} textureRect - {{777,1894},{118,92}} + {{711,985},{118,92}} textureRotated - + Water_Splash_03_03.png @@ -2278,9 +2278,9 @@ spriteSourceSize {154,154} textureRect - {{397,1241},{130,84}} + {{1284,600},{130,84}} textureRotated - + Water_Splash_03_04.png @@ -2295,7 +2295,7 @@ spriteSourceSize {154,154} textureRect - {{732,442},{134,94}} + {{663,570},{134,94}} textureRotated @@ -2312,7 +2312,7 @@ spriteSourceSize {154,154} textureRect - {{503,578},{140,102}} + {{1170,330},{140,102}} textureRotated @@ -2329,7 +2329,7 @@ spriteSourceSize {154,154} textureRect - {{503,464},{140,112}} + {{849,507},{140,112}} textureRotated @@ -2346,7 +2346,7 @@ spriteSourceSize {154,154} textureRect - {{726,254},{140,114}} + {{657,454},{140,114}} textureRotated @@ -2363,7 +2363,7 @@ spriteSourceSize {154,154} textureRect - {{829,1360},{96,96}} + {{1535,698},{96,96}} textureRotated @@ -2380,7 +2380,7 @@ spriteSourceSize {154,154} textureRect - {{1012,464},{66,72}} + {{1769,948},{66,72}} textureRotated @@ -2397,7 +2397,7 @@ spriteSourceSize {154,154} textureRect - {{1140,1655},{38,34}} + {{1615,900},{38,34}} textureRotated @@ -2414,9 +2414,9 @@ spriteSourceSize {154,154} textureRect - {{829,1458},{44,90}} + {{1465,180},{44,90}} textureRotated - + Water_Splash_05_02.png @@ -2431,9 +2431,9 @@ spriteSourceSize {154,154} textureRect - {{813,1016},{52,124}} + {{621,679},{52,124}} textureRotated - + Water_Splash_05_03.png @@ -2448,7 +2448,7 @@ spriteSourceSize {154,154} textureRect - {{983,263},{66,138}} + {{1658,294},{66,138}} textureRotated @@ -2465,9 +2465,9 @@ spriteSourceSize {154,154} textureRect - {{755,1360},{72,142}} + {{1310,247},{72,142}} textureRotated - + Water_Splash_05_05.png @@ -2482,7 +2482,7 @@ spriteSourceSize {154,154} textureRect - {{506,380},{82,146}} + {{991,534},{82,146}} textureRotated @@ -2499,7 +2499,7 @@ spriteSourceSize {154,154} textureRect - {{628,968},{92,148}} + {{849,413},{92,148}} textureRotated @@ -2516,9 +2516,9 @@ spriteSourceSize {154,154} textureRect - {{563,1768},{98,152}} + {{999,434},{98,152}} textureRotated - + Water_Splash_05_08.png @@ -2533,7 +2533,7 @@ spriteSourceSize {154,154} textureRect - {{614,1062},{102,148}} + {{1153,434},{102,148}} textureRotated @@ -2550,9 +2550,9 @@ spriteSourceSize {154,154} textureRect - {{238,1135},{104,132}} + {{875,743},{104,132}} textureRotated - + Water_Splash_05_10.png @@ -2567,7 +2567,7 @@ spriteSourceSize {154,154} textureRect - {{586,1922},{100,120}} + {{1942,1},{100,120}} textureRotated @@ -2584,9 +2584,9 @@ spriteSourceSize {154,154} textureRect - {{921,1472},{38,110}} + {{1683,549},{38,110}} textureRotated - + Water_Splash_05_12.png @@ -2601,7 +2601,7 @@ spriteSourceSize {154,154} textureRect - {{997,1512},{38,98}} + {{1468,586},{38,98}} textureRotated @@ -2618,7 +2618,7 @@ spriteSourceSize {240,80} textureRect - {{1,1901},{144,48}} + {{799,454},{144,48}} textureRotated @@ -2635,7 +2635,7 @@ spriteSourceSize {99,331} textureRect - {{726,102},{91,325}} + {{1059,1},{91,325}} textureRotated @@ -2669,9 +2669,9 @@ spriteSourceSize {99,331} textureRect - {{1,1014},{97,331}} + {{726,102},{97,331}} textureRotated - + appear/cappear1_1.png @@ -2703,9 +2703,9 @@ spriteSourceSize {277,250} textureRect - {{68,1768},{201,184}} + {{234,493},{201,184}} textureRotated - + appear/cappear1_2.png @@ -2856,9 +2856,9 @@ spriteSourceSize {319,89} textureRect - {{234,493},{209,65}} + {{1386,72},{209,65}} textureRotated - + appear/cappear2_10.png @@ -2873,7 +2873,7 @@ spriteSourceSize {319,89} textureRect - {{1025,1184},{95,51}} + {{1508,579},{95,51}} textureRotated @@ -2890,7 +2890,7 @@ spriteSourceSize {319,89} textureRect - {{171,1014},{225,65}} + {{201,745},{225,65}} textureRotated @@ -2907,9 +2907,9 @@ spriteSourceSize {319,89} textureRect - {{301,692},{199,57}} + {{420,489},{199,57}} textureRotated - + appear/cappear2_4.png @@ -2924,9 +2924,9 @@ spriteSourceSize {319,89} textureRect - {{1,1650},{249,65}} + {{1691,1},{249,65}} textureRotated - + appear/cappear2_5.png @@ -2941,7 +2941,7 @@ spriteSourceSize {319,89} textureRect - {{726,195},{255,57}} + {{726,201},{255,57}} textureRotated @@ -2958,9 +2958,9 @@ spriteSourceSize {319,89} textureRect - {{1,1347},{301,71}} + {{1059,94},{301,71}} textureRotated - + appear/cappear2_7.png @@ -2975,9 +2975,9 @@ spriteSourceSize {319,89} textureRect - {{201,745},{255,57}} + {{1059,167},{255,57}} textureRotated - + appear/cappear2_8.png @@ -2992,9 +2992,9 @@ spriteSourceSize {319,89} textureRect - {{100,1014},{303,69}} + {{1386,1},{303,69}} textureRotated - + appear/cappear2_9.png @@ -3009,9 +3009,9 @@ spriteSourceSize {319,89} textureRect - {{830,1602},{95,49}} + {{1640,796},{95,49}} textureRotated - + appear1_1.png @@ -3026,9 +3026,9 @@ spriteSourceSize {164,155} textureRect - {{1025,1281},{64,51}} + {{1838,1015},{64,51}} textureRotated - + appear1_2.png @@ -3043,9 +3043,9 @@ spriteSourceSize {164,155} textureRect - {{779,1801},{84,91}} + {{1013,993},{84,91}} textureRotated - + appear1_3.png @@ -3060,9 +3060,9 @@ spriteSourceSize {164,155} textureRect - {{289,1241},{106,133}} + {{528,571},{106,133}} textureRotated - + appear1_4.png @@ -3077,9 +3077,9 @@ spriteSourceSize {164,155} textureRect - {{1053,125},{126,155}} + {{268,862},{126,155}} textureRotated - + appear1_5.png @@ -3094,9 +3094,9 @@ spriteSourceSize {164,155} textureRect - {{491,1524},{154,155}} + {{692,260},{154,155}} textureRotated - + appear1_6.png @@ -3111,7 +3111,7 @@ spriteSourceSize {164,155} textureRect - {{285,1376},{164,151}} + {{268,696},{164,151}} textureRotated @@ -3128,9 +3128,9 @@ spriteSourceSize {164,155} textureRect - {{289,1241},{106,133}} + {{528,571},{106,133}} textureRotated - + appear1_8.png @@ -3145,9 +3145,9 @@ spriteSourceSize {164,155} textureRect - {{779,1801},{84,91}} + {{1013,993},{84,91}} textureRotated - + appear1_9.png @@ -3162,9 +3162,9 @@ spriteSourceSize {164,155} textureRect - {{1025,1281},{64,51}} + {{1838,1015},{64,51}} textureRotated - + electricity_00.png @@ -3179,7 +3179,7 @@ spriteSourceSize {70,70} textureRect - {{1082,1855},{44,44}} + {{1693,1033},{44,44}} textureRotated @@ -3196,7 +3196,7 @@ spriteSourceSize {70,70} textureRect - {{1128,1862},{50,50}} + {{1904,1005},{50,50}} textureRotated @@ -3213,9 +3213,9 @@ spriteSourceSize {70,70} textureRect - {{1140,1695},{34,32}} + {{234,696},{34,32}} textureRotated - + electricity_06.png @@ -3230,7 +3230,7 @@ spriteSourceSize {70,70} textureRect - {{1020,538},{58,60}} + {{1753,733},{58,60}} textureRotated @@ -3247,7 +3247,7 @@ spriteSourceSize {70,70} textureRect - {{1060,1119},{62,62}} + {{1837,951},{62,62}} textureRotated @@ -3264,7 +3264,7 @@ spriteSourceSize {70,70} textureRect - {{997,1612},{42,38}} + {{637,805},{42,38}} textureRotated @@ -3281,7 +3281,7 @@ spriteSourceSize {70,70} textureRect - {{983,195},{68,66}} + {{1912,771},{68,66}} textureRotated @@ -3298,7 +3298,7 @@ spriteSourceSize {70,70} textureRect - {{927,1595},{68,66}} + {{1912,839},{68,66}} textureRotated @@ -3315,7 +3315,7 @@ spriteSourceSize {70,70} textureRect - {{994,1672},{66,64}} + {{1841,850},{66,64}} textureRotated @@ -3332,7 +3332,7 @@ spriteSourceSize {70,70} textureRect - {{871,1987},{58,60}} + {{1982,771},{58,60}} textureRotated @@ -3349,7 +3349,7 @@ spriteSourceSize {70,70} textureRect - {{671,692},{52,54}} + {{821,911},{52,54}} textureRotated @@ -3366,7 +3366,7 @@ spriteSourceSize {70,70} textureRect - {{1123,1914},{50,50}} + {{1956,1005},{50,50}} textureRotated @@ -3383,7 +3383,7 @@ spriteSourceSize {70,70} textureRect - {{1038,1980},{44,44}} + {{1739,1033},{44,44}} textureRotated @@ -3400,7 +3400,7 @@ spriteSourceSize {70,70} textureRect - {{1121,1551},{40,40}} + {{201,972},{40,40}} textureRotated @@ -3417,7 +3417,7 @@ spriteSourceSize {70,70} textureRect - {{1123,1966},{32,32}} + {{1986,737},{32,32}} textureRotated @@ -3434,7 +3434,7 @@ spriteSourceSize {70,70} textureRect - {{1084,2014},{24,24}} + {{1927,576},{24,24}} textureRotated @@ -3451,7 +3451,7 @@ spriteSourceSize {70,70} textureRect - {{791,930},{18,18}} + {{1147,330},{18,18}} textureRotated @@ -3468,9 +3468,9 @@ spriteSourceSize {113,91} textureRect - {{934,709},{111,89}} + {{1222,806},{111,89}} textureRotated - + fire_big_01.png @@ -3485,9 +3485,9 @@ spriteSourceSize {113,91} textureRect - {{1025,709},{111,89}} + {{1839,430},{111,89}} textureRotated - + fire_big_02.png @@ -3502,7 +3502,7 @@ spriteSourceSize {113,91} textureRect - {{813,923},{111,91}} + {{1335,804},{111,91}} textureRotated @@ -3519,9 +3519,9 @@ spriteSourceSize {113,91} textureRect - {{846,1070},{111,91}} + {{1839,337},{111,91}} textureRotated - + fire_big_04.png @@ -3536,7 +3536,7 @@ spriteSourceSize {113,91} textureRect - {{51,1954},{113,91}} + {{596,986},{113,91}} textureRotated @@ -3553,7 +3553,7 @@ spriteSourceSize {113,91} textureRect - {{166,1954},{113,91}} + {{1739,150},{113,91}} textureRotated @@ -3570,7 +3570,7 @@ spriteSourceSize {113,91} textureRect - {{868,371},{113,91}} + {{1739,243},{113,91}} textureRotated @@ -3587,9 +3587,9 @@ spriteSourceSize {113,91} textureRect - {{1025,822},{111,87}} + {{426,990},{111,87}} textureRotated - + gd.png @@ -3604,7 +3604,7 @@ spriteSourceSize {83,81} textureRect - {{912,1512},{83,81}} + {{1530,857},{83,81}} textureRotated @@ -3621,7 +3621,7 @@ spriteSourceSize {127,127} textureRect - {{468,1111},{127,127}} + {{528,442},{127,127}} textureRotated @@ -3638,9 +3638,9 @@ spriteSourceSize {167,93} textureRect - {{714,1360},{147,39}} + {{1362,139},{147,39}} textureRotated - + i2.png @@ -3655,7 +3655,7 @@ spriteSourceSize {167,93} textureRect - {{683,456},{147,47}} + {{479,489},{147,47}} textureRotated @@ -3672,9 +3672,9 @@ spriteSourceSize {167,93} textureRect - {{647,1360},{147,65}} + {{991,618},{147,65}} textureRotated - + i4.png @@ -3689,9 +3689,9 @@ spriteSourceSize {167,93} textureRect - {{647,1509},{147,65}} + {{1316,180},{147,65}} textureRotated - + i5.png @@ -3706,7 +3706,7 @@ spriteSourceSize {167,93} textureRect - {{714,1509},{147,65}} + {{1423,437},{147,65}} textureRotated @@ -3723,7 +3723,7 @@ spriteSourceSize {82,82} textureRect - {{1037,1512},{82,82}} + {{929,995},{82,82}} textureRotated @@ -3739,9 +3739,9 @@ realTextureFileName skills.png size - {1180,2046} + {2043,1078} smartupdate - $TexturePacker:SmartUpdate:4f2ce9cf8b2a0466c9b9c06b3708bb83:6b161e360c594c6ba149959c107ea108:37e596914ac459dbdf00101432af5e18$ + $TexturePacker:SmartUpdate:4b1e6052c8237b12e0770a7b9db2e0fe:6b161e360c594c6ba149959c107ea108:37e596914ac459dbdf00101432af5e18$ textureFileName skills.png diff --git a/assets/resources/game/skills/skills.plist.meta b/assets/resources/game/skills/skills.plist.meta index 5eacbcb7..193137cf 100644 --- a/assets/resources/game/skills/skills.plist.meta +++ b/assets/resources/game/skills/skills.plist.meta @@ -19,8 +19,8 @@ "rotated": true, "offsetX": 8, "offsetY": 10, - "trimX": 100, - "trimY": 1319, + "trimX": 1454, + "trimY": 272, "width": 15, "height": 55, "rawWidth": 39, @@ -62,11 +62,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 645, - "trimY": 464, + "trimX": 536, + "trimY": 404, "width": 150, "height": 36, "rawWidth": 160, @@ -108,11 +108,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 3, - "trimX": 1037, - "trimY": 1596, + "trimX": 1753, + "trimY": 646, "width": 37, "height": 85, "rawWidth": 39, @@ -157,8 +157,8 @@ "rotated": false, "offsetX": -4, "offsetY": -27, - "trimX": 997, - "trimY": 1512, + "trimX": 1468, + "trimY": 586, "width": 38, "height": 98, "rawWidth": 154, @@ -203,8 +203,8 @@ "rotated": true, "offsetX": -3, "offsetY": -49, - "trimX": 1140, - "trimY": 1655, + "trimX": 1615, + "trimY": 900, "width": 38, "height": 34, "rawWidth": 154, @@ -249,8 +249,8 @@ "rotated": true, "offsetX": -1, "offsetY": 2, - "trimX": 506, - "trimY": 380, + "trimX": 991, + "trimY": 534, "width": 82, "height": 146, "rawWidth": 154, @@ -292,11 +292,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -6, "offsetY": -3, - "trimX": 285, - "trimY": 1542, + "trimX": 849, + "trimY": 260, "width": 148, "height": 151, "rawWidth": 228, @@ -338,11 +338,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 16, "offsetY": -2, - "trimX": 171, - "trimY": 1241, + "trimX": 875, + "trimY": 877, "width": 104, "height": 116, "rawWidth": 154, @@ -387,8 +387,8 @@ "rotated": true, "offsetX": 16, "offsetY": -1, - "trimX": 781, - "trimY": 1504, + "trimX": 799, + "trimY": 600, "width": 142, "height": 47, "rawWidth": 184, @@ -433,8 +433,8 @@ "rotated": false, "offsetX": -1, "offsetY": -5, - "trimX": 1084, - "trimY": 2014, + "trimX": 1927, + "trimY": 576, "width": 24, "height": 24, "rawWidth": 70, @@ -525,8 +525,8 @@ "rotated": true, "offsetX": -13, "offsetY": -10, - "trimX": 718, - "trimY": 1240, + "trimX": 1222, + "trimY": 686, "width": 118, "height": 102, "rawWidth": 154, @@ -571,8 +571,8 @@ "rotated": false, "offsetX": -5, "offsetY": -2, - "trimX": 868, - "trimY": 254, + "trimX": 1326, + "trimY": 897, "width": 113, "height": 115, "rawWidth": 171, @@ -617,8 +617,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 573, - "trimY": 1681, + "trimX": 1854, + "trimY": 168, "width": 85, "height": 86, "rawWidth": 85, @@ -663,8 +663,8 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 457, - "trimY": 936, + "trimX": 999, + "trimY": 363, "width": 169, "height": 69, "rawWidth": 205, @@ -752,11 +752,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": -4, - "trimX": 688, - "trimY": 1886, + "trimX": 297, + "trimY": 990, "width": 127, "height": 87, "rawWidth": 129, @@ -801,8 +801,8 @@ "rotated": false, "offsetX": -1, "offsetY": -3, - "trimX": 994, - "trimY": 1672, + "trimX": 1841, + "trimY": 850, "width": 66, "height": 64, "rawWidth": 70, @@ -847,8 +847,8 @@ "rotated": false, "offsetX": 0, "offsetY": -2, - "trimX": 927, - "trimY": 1595, + "trimX": 1912, + "trimY": 839, "width": 68, "height": 66, "rawWidth": 70, @@ -893,8 +893,8 @@ "rotated": false, "offsetX": -1, "offsetY": -40, - "trimX": 830, - "trimY": 2014, + "trimX": 831, + "trimY": 967, "width": 36, "height": 24, "rawWidth": 104, @@ -936,11 +936,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 2, "offsetY": -30, - "trimX": 1124, - "trimY": 1593, + "trimX": 1689, + "trimY": 749, "width": 60, "height": 44, "rawWidth": 104, @@ -985,8 +985,8 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 639, - "trimY": 930, + "trimX": 688, + "trimY": 416, "width": 150, "height": 36, "rawWidth": 160, @@ -1031,8 +1031,8 @@ "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 926, - "trimY": 932, + "trimX": 831, + "trimY": 995, "width": 82, "height": 96, "rawWidth": 102, @@ -1074,11 +1074,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 1, - "trimX": 830, - "trimY": 1504, + "trimX": 1854, + "trimY": 255, "width": 80, "height": 96, "rawWidth": 102, @@ -1120,11 +1120,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 2, - "trimX": 822, - "trimY": 1280, + "trimX": 1862, + "trimY": 68, "width": 78, "height": 98, "rawWidth": 102, @@ -1169,8 +1169,8 @@ "rotated": true, "offsetX": 0, "offsetY": -5, - "trimX": 284, - "trimY": 1692, + "trimX": 1511, + "trimY": 139, "width": 74, "height": 84, "rawWidth": 102, @@ -1212,11 +1212,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": -4, - "trimX": 1024, - "trimY": 935, + "trimX": 1448, + "trimY": 801, "width": 76, "height": 88, "rawWidth": 102, @@ -1258,11 +1258,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 1, "offsetY": -3, - "trimX": 865, - "trimY": 1801, + "trimX": 1952, + "trimY": 239, "width": 76, "height": 90, "rawWidth": 102, @@ -1304,11 +1304,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": -3, - "trimX": 871, - "trimY": 1893, + "trimX": 1597, + "trimY": 72, "width": 76, "height": 92, "rawWidth": 102, @@ -1350,11 +1350,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": -3, - "trimX": 764, - "trimY": 1070, + "trimX": 1562, + "trimY": 511, "width": 80, "height": 94, "rawWidth": 102, @@ -1399,8 +1399,8 @@ "rotated": true, "offsetX": 1, "offsetY": -1, - "trimX": 438, - "trimY": 1373, + "trimX": 483, + "trimY": 247, "width": 174, "height": 51, "rawWidth": 184, @@ -1442,11 +1442,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 18, "offsetY": 1, - "trimX": 438, - "trimY": 1549, + "trimX": 1283, + "trimY": 547, "width": 138, "height": 51, "rawWidth": 184, @@ -1488,11 +1488,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 18, "offsetY": 1, - "trimX": 438, - "trimY": 1549, + "trimX": 1283, + "trimY": 547, "width": 138, "height": 51, "rawWidth": 184, @@ -1534,11 +1534,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -6, "offsetY": -1, - "trimX": 834, - "trimY": 1749, + "trimX": 1416, + "trimY": 600, "width": 84, "height": 50, "rawWidth": 102, @@ -1583,8 +1583,8 @@ "rotated": false, "offsetX": -3, "offsetY": 0, - "trimX": 927, - "trimY": 1424, + "trimX": 1927, + "trimY": 612, "width": 88, "height": 46, "rawWidth": 102, @@ -1626,11 +1626,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -2, "offsetY": 0, - "trimX": 997, - "trimY": 1801, + "trimX": 1952, + "trimY": 371, "width": 90, "height": 46, "rawWidth": 102, @@ -1672,11 +1672,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -2, "offsetY": 0, - "trimX": 943, - "trimY": 1801, + "trimX": 1952, + "trimY": 317, "width": 90, "height": 52, "rawWidth": 102, @@ -1721,8 +1721,8 @@ "rotated": false, "offsetX": -48, "offsetY": -48, - "trimX": 1020, - "trimY": 600, + "trimX": 1979, + "trimY": 953, "width": 58, "height": 28, "rawWidth": 154, @@ -1767,8 +1767,8 @@ "rotated": true, "offsetX": -19, "offsetY": -37, - "trimX": 281, - "trimY": 1939, + "trimX": 1633, + "trimY": 698, "width": 96, "height": 54, "rawWidth": 154, @@ -1810,11 +1810,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": -4, - "trimX": 1059, - "trimY": 1, + "trimX": 675, + "trimY": 666, "width": 122, "height": 120, "rawWidth": 154, @@ -1856,11 +1856,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 4, "offsetY": -5, - "trimX": 464, - "trimY": 1927, + "trimX": 848, + "trimY": 621, "width": 118, "height": 120, "rawWidth": 154, @@ -1905,8 +1905,8 @@ "rotated": false, "offsetX": 6, "offsetY": -4, - "trimX": 1051, - "trimY": 282, + "trimX": 1102, + "trimY": 686, "width": 118, "height": 114, "rawWidth": 154, @@ -1948,11 +1948,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 11, "offsetY": -1, - "trimX": 602, - "trimY": 1240, + "trimX": 1312, + "trimY": 321, "width": 114, "height": 118, "rawWidth": 154, @@ -1997,8 +1997,8 @@ "rotated": true, "offsetX": 13, "offsetY": -3, - "trimX": 663, - "trimY": 1768, + "trimX": 1326, + "trimY": 686, "width": 116, "height": 114, "rawWidth": 154, @@ -2043,8 +2043,8 @@ "rotated": true, "offsetX": 19, "offsetY": -1, - "trimX": 344, - "trimY": 1937, + "trimX": 1303, + "trimY": 437, "width": 108, "height": 118, "rawWidth": 154, @@ -2089,8 +2089,8 @@ "rotated": true, "offsetX": 22, "offsetY": 1, - "trimX": 661, - "trimY": 1658, + "trimX": 1208, + "trimY": 897, "width": 108, "height": 116, "rawWidth": 154, @@ -2132,11 +2132,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 26, "offsetY": 0, - "trimX": 813, - "trimY": 821, + "trimX": 1942, + "trimY": 123, "width": 100, "height": 114, "rawWidth": 154, @@ -2178,11 +2178,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 30, "offsetY": 1, - "trimX": 929, - "trimY": 822, + "trimX": 1098, + "trimY": 897, "width": 94, "height": 108, "rawWidth": 154, @@ -2227,8 +2227,8 @@ "rotated": false, "offsetX": 30, "offsetY": 1, - "trimX": 834, - "trimY": 1653, + "trimX": 1955, + "trimY": 516, "width": 80, "height": 94, "rawWidth": 154, @@ -2270,11 +2270,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -13, "offsetY": 22, - "trimX": 628, - "trimY": 936, + "trimX": 1838, + "trimY": 1068, "width": 25, "height": 9, "rawWidth": 205, @@ -2319,8 +2319,8 @@ "rotated": true, "offsetX": 20, "offsetY": 9, - "trimX": 778, - "trimY": 968, + "trimX": 1997, + "trimY": 660, "width": 75, "height": 33, "rawWidth": 205, @@ -2365,8 +2365,8 @@ "rotated": false, "offsetX": 24, "offsetY": 8, - "trimX": 939, - "trimY": 1129, + "trimX": 1834, + "trimY": 521, "width": 119, "height": 53, "rawWidth": 205, @@ -2411,8 +2411,8 @@ "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 271, - "trimY": 1768, + "trimX": 421, + "trimY": 690, "width": 169, "height": 71, "rawWidth": 205, @@ -2454,11 +2454,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 2, - "trimX": 344, - "trimY": 1768, + "trimX": 1, + "trimY": 1014, "width": 167, "height": 63, "rawWidth": 205, @@ -2503,8 +2503,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 502, - "trimY": 692, + "trimX": 1691, + "trimY": 91, "width": 167, "height": 57, "rawWidth": 205, @@ -2546,11 +2546,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -14, "offsetY": 0, - "trimX": 779, - "trimY": 1658, + "trimX": 494, + "trimY": 806, "width": 141, "height": 53, "rawWidth": 205, @@ -2592,11 +2592,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -17, "offsetY": 19, - "trimX": 1023, - "trimY": 1893, + "trimX": 1432, + "trimY": 321, "width": 107, "height": 13, "rawWidth": 205, @@ -2638,11 +2638,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 1, "offsetY": 1, - "trimX": 654, - "trimY": 243, + "trimX": 1184, + "trimY": 1007, "width": 70, "height": 140, "rawWidth": 154, @@ -2687,8 +2687,8 @@ "rotated": true, "offsetX": -1, "offsetY": 2, - "trimX": 597, - "trimY": 1166, + "trimX": 1139, + "trimY": 538, "width": 72, "height": 142, "rawWidth": 154, @@ -2733,8 +2733,8 @@ "rotated": true, "offsetX": -1, "offsetY": 1, - "trimX": 726, - "trimY": 370, + "trimX": 1597, + "trimY": 150, "width": 70, "height": 140, "rawWidth": 154, @@ -2779,8 +2779,8 @@ "rotated": true, "offsetX": -1, "offsetY": 2, - "trimX": 732, - "trimY": 538, + "trimX": 677, + "trimY": 911, "width": 72, "height": 142, "rawWidth": 154, @@ -2825,8 +2825,8 @@ "rotated": true, "offsetX": -1, "offsetY": 1, - "trimX": 829, - "trimY": 637, + "trimX": 1597, + "trimY": 222, "width": 70, "height": 140, "rawWidth": 154, @@ -2871,8 +2871,8 @@ "rotated": true, "offsetX": 0, "offsetY": 2, - "trimX": 868, - "trimY": 464, + "trimX": 1140, + "trimY": 612, "width": 72, "height": 142, "rawWidth": 154, @@ -2914,11 +2914,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 1, "offsetY": 1, - "trimX": 971, - "trimY": 637, + "trimX": 1490, + "trimY": 437, "width": 70, "height": 140, "rawWidth": 154, @@ -2963,8 +2963,8 @@ "rotated": true, "offsetX": 0, "offsetY": 2, - "trimX": 876, - "trimY": 538, + "trimX": 981, + "trimY": 804, "width": 72, "height": 142, "rawWidth": 154, @@ -3007,14 +3007,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 6, - "offsetY": -3, - "trimX": 927, - "trimY": 1338, - "width": 85, - "height": 84, - "rawWidth": 229, - "rawHeight": 212, + "offsetX": 3, + "offsetY": -1, + "trimX": 1982, + "trimY": 863, + "width": 53, + "height": 53, + "rawWidth": 137, + "rawHeight": 127, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -3052,15 +3052,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, - "offsetX": 6, - "offsetY": -5, - "trimX": 725, - "trimY": 612, - "width": 101, - "height": 92, - "rawWidth": 229, - "rawHeight": 212, + "rotated": true, + "offsetX": 3, + "offsetY": -3, + "trimX": 1435, + "trimY": 1014, + "width": 63, + "height": 57, + "rawWidth": 137, + "rawHeight": 127, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -3098,15 +3098,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, - "offsetX": 5, + "rotated": true, + "offsetX": 3, "offsetY": -1, - "trimX": 813, - "trimY": 709, - "width": 119, - "height": 110, - "rawWidth": 229, - "rawHeight": 212, + "trimX": 1769, + "trimY": 873, + "width": 73, + "height": 67, + "rawWidth": 137, + "rawHeight": 127, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -3144,15 +3144,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, - "offsetX": 3, - "offsetY": 3, - "trimX": 409, - "trimY": 1768, - "width": 157, - "height": 152, - "rawWidth": 229, - "rawHeight": 212, + "rotated": false, + "offsetX": 2, + "offsetY": 2, + "trimX": 1125, + "trimY": 802, + "width": 95, + "height": 93, + "rawWidth": 137, + "rawHeight": 127, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -3190,15 +3190,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, - "offsetX": 2, - "offsetY": 3, - "trimX": 639, - "trimY": 751, - "width": 177, - "height": 172, - "rawWidth": 229, - "rawHeight": 212, + "rotated": false, + "offsetX": 1, + "offsetY": 2, + "trimX": 1725, + "trimY": 441, + "width": 107, + "height": 105, + "rawWidth": 137, + "rawHeight": 127, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -3236,15 +3236,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, - "offsetX": 2, - "offsetY": 3, - "trimX": 457, - "trimY": 751, - "width": 183, - "height": 180, - "rawWidth": 229, - "rawHeight": 212, + "rotated": false, + "offsetX": 1, + "offsetY": 2, + "trimX": 1545, + "trimY": 294, + "width": 111, + "height": 109, + "rawWidth": 137, + "rawHeight": 127, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -3284,13 +3284,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 1, - "offsetY": 2, - "trimX": 260, - "trimY": 947, - "width": 189, - "height": 186, - "rawWidth": 229, - "rawHeight": 212, + "offsetY": 1, + "trimX": 981, + "trimY": 878, + "width": 115, + "height": 113, + "rawWidth": 137, + "rawHeight": 127, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -3329,14 +3329,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 1, - "offsetY": 2, - "trimX": 260, - "trimY": 751, - "width": 195, - "height": 194, - "rawWidth": 229, - "rawHeight": 212, + "offsetX": 0, + "offsetY": 1, + "trimX": 981, + "trimY": 685, + "width": 119, + "height": 117, + "rawWidth": 137, + "rawHeight": 127, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -3375,14 +3375,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": true, - "offsetX": 1, + "offsetX": 0, "offsetY": 1, - "trimX": 301, - "trimY": 489, - "width": 201, - "height": 200, - "rawWidth": 229, - "rawHeight": 212, + "trimX": 554, + "trimY": 861, + "width": 123, + "height": 121, + "rawWidth": 137, + "rawHeight": 127, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -3420,15 +3420,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, - "offsetY": 1, - "trimX": 74, - "trimY": 1559, - "width": 207, - "height": 208, - "rawWidth": 229, - "rawHeight": 212, + "offsetY": 0, + "trimX": 494, + "trimY": 679, + "width": 125, + "height": 125, + "rawWidth": 137, + "rawHeight": 127, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -3469,12 +3469,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 74, - "trimY": 1347, - "width": 209, - "height": 210, - "rawWidth": 229, - "rawHeight": 212, + "trimX": 425, + "trimY": 861, + "width": 127, + "height": 127, + "rawWidth": 137, + "rawHeight": 127, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -3515,8 +3515,8 @@ "rotated": false, "offsetX": -1, "offsetY": -9, - "trimX": 1008, - "trimY": 1738, + "trimX": 1785, + "trimY": 1022, "width": 51, "height": 53, "rawWidth": 171, @@ -3558,11 +3558,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -2, "offsetY": -4, - "trimX": 939, - "trimY": 1016, + "trimX": 1726, + "trimY": 336, "width": 111, "height": 103, "rawWidth": 171, @@ -3607,8 +3607,8 @@ "rotated": false, "offsetX": -3, "offsetY": -1, - "trimX": 483, - "trimY": 1240, + "trimX": 677, + "trimY": 788, "width": 117, "height": 121, "rawWidth": 171, @@ -3650,11 +3650,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 14, "offsetY": -2, - "trimX": 450, - "trimY": 1689, + "trimX": 796, + "trimY": 788, "width": 77, "height": 121, "rawWidth": 171, @@ -3696,11 +3696,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -2, "offsetY": -12, - "trimX": 654, - "trimY": 385, + "trimX": 1841, + "trimY": 778, "width": 70, "height": 69, "rawWidth": 228, @@ -3745,8 +3745,8 @@ "rotated": false, "offsetX": -2, "offsetY": -6, - "trimX": 506, - "trimY": 243, + "trimX": 999, + "trimY": 226, "width": 146, "height": 135, "rawWidth": 228, @@ -3791,8 +3791,8 @@ "rotated": false, "offsetX": -4, "offsetY": -2, - "trimX": 491, - "trimY": 1363, + "trimX": 536, + "trimY": 243, "width": 154, "height": 159, "rawWidth": 228, @@ -3837,8 +3837,8 @@ "rotated": true, "offsetX": 18, "offsetY": -2, - "trimX": 451, - "trimY": 1007, + "trimX": 1147, + "trimY": 226, "width": 102, "height": 161, "rawWidth": 228, @@ -3880,11 +3880,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -2, "offsetY": -1, - "trimX": 1084, - "trimY": 1971, + "trimX": 479, + "trimY": 638, "width": 33, "height": 41, "rawWidth": 113, @@ -3926,11 +3926,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -2, "offsetY": 3, - "trimX": 928, - "trimY": 1184, + "trimX": 1952, + "trimY": 419, "width": 83, "height": 95, "rawWidth": 113, @@ -3972,11 +3972,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 3, - "trimX": 823, - "trimY": 1183, + "trimX": 1561, + "trimY": 593, "width": 95, "height": 103, "rawWidth": 113, @@ -4018,11 +4018,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 1, "offsetY": 1, - "trimX": 1080, - "trimY": 513, + "trimX": 1432, + "trimY": 336, "width": 99, "height": 111, "rawWidth": 113, @@ -4067,8 +4067,8 @@ "rotated": false, "offsetX": 6, "offsetY": 0, - "trimX": 1088, - "trimY": 398, + "trimX": 1442, + "trimY": 686, "width": 91, "height": 113, "rawWidth": 113, @@ -4110,11 +4110,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 40, "offsetY": 39, - "trimX": 750, - "trimY": 2015, + "trimX": 1618, + "trimY": 940, "width": 25, "height": 35, "rawWidth": 113, @@ -4156,11 +4156,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -71, "offsetY": -1, - "trimX": 1121, - "trimY": 1464, + "trimX": 983, + "trimY": 201, "width": 61, "height": 17, "rawWidth": 215, @@ -4202,11 +4202,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -18, "offsetY": 0, - "trimX": 829, - "trimY": 612, + "trimX": 1658, + "trimY": 549, "width": 141, "height": 23, "rawWidth": 215, @@ -4248,11 +4248,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 9, "offsetY": 0, - "trimX": 483, - "trimY": 247, + "trimX": 1691, + "trimY": 68, "width": 169, "height": 21, "rawWidth": 215, @@ -4297,8 +4297,8 @@ "rotated": true, "offsetX": 38, "offsetY": -2, - "trimX": 238, - "trimY": 1002, + "trimX": 1441, + "trimY": 897, "width": 115, "height": 15, "rawWidth": 215, @@ -4343,8 +4343,8 @@ "rotated": true, "offsetX": 72, "offsetY": -2, - "trimX": 51, - "trimY": 1901, + "trimX": 968, + "trimY": 621, "width": 51, "height": 15, "rawWidth": 215, @@ -4389,8 +4389,8 @@ "rotated": false, "offsetX": 90, "offsetY": -3, - "trimX": 1124, - "trimY": 1168, + "trimX": 1723, + "trimY": 646, "width": 23, "height": 13, "rawWidth": 215, @@ -4432,11 +4432,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1078, - "trimY": 1269, + "trimX": 1494, + "trimY": 997, "width": 76, "height": 80, "rawWidth": 84, @@ -4478,11 +4478,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -2, "offsetY": 1, - "trimX": 370, - "trimY": 1692, + "trimX": 1693, + "trimY": 953, "width": 78, "height": 74, "rawWidth": 84, @@ -4527,8 +4527,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 916, - "trimY": 1663, + "trimX": 1106, + "trimY": 993, "width": 84, "height": 76, "rawWidth": 84, @@ -4570,11 +4570,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 2, - "trimX": 1078, - "trimY": 1183, + "trimX": 1511, + "trimY": 215, "width": 84, "height": 76, "rawWidth": 84, @@ -4619,8 +4619,8 @@ "rotated": false, "offsetX": -1, "offsetY": 2, - "trimX": 1062, - "trimY": 1672, + "trimX": 1691, + "trimY": 875, "width": 76, "height": 76, "rawWidth": 84, @@ -4662,11 +4662,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 645, - "trimY": 616, + "trimX": 1691, + "trimY": 795, "width": 74, "height": 78, "rawWidth": 84, @@ -4708,11 +4708,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1103, - "trimY": 1347, + "trimX": 1833, + "trimY": 650, "width": 76, "height": 80, "rawWidth": 84, @@ -4757,8 +4757,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 741, - "trimY": 1166, + "trimX": 1915, + "trimY": 660, "width": 72, "height": 80, "rawWidth": 84, @@ -4803,8 +4803,8 @@ "rotated": true, "offsetX": 0, "offsetY": 5, - "trimX": 372, - "trimY": 1135, + "trimX": 1562, + "trimY": 405, "width": 104, "height": 94, "rawWidth": 110, @@ -4849,8 +4849,8 @@ "rotated": true, "offsetX": 2, "offsetY": -40, - "trimX": 663, - "trimY": 1886, + "trimX": 1362, + "trimY": 94, "width": 28, "height": 22, "rawWidth": 104, @@ -4892,11 +4892,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 1, "offsetY": -29, - "trimX": 1124, - "trimY": 1100, + "trimX": 1911, + "trimY": 907, "width": 66, "height": 46, "rawWidth": 104, @@ -4938,11 +4938,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 1, "offsetY": -14, - "trimX": 1014, - "trimY": 1347, + "trimX": 1767, + "trimY": 795, "width": 72, "height": 76, "rawWidth": 104, @@ -4984,11 +4984,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 1, "offsetY": -6, - "trimX": 949, - "trimY": 1893, + "trimX": 1833, + "trimY": 576, "width": 72, "height": 92, "rawWidth": 104, @@ -5033,8 +5033,8 @@ "rotated": false, "offsetX": 1, "offsetY": 0, - "trimX": 1044, - "trimY": 1013, + "trimX": 1458, + "trimY": 891, "width": 70, "height": 104, "rawWidth": 104, @@ -5079,8 +5079,8 @@ "rotated": false, "offsetX": -2, "offsetY": -9, - "trimX": 1116, - "trimY": 977, + "trimX": 1689, + "trimY": 661, "width": 62, "height": 86, "rawWidth": 104, @@ -5125,8 +5125,8 @@ "rotated": true, "offsetX": -1, "offsetY": -9, - "trimX": 920, - "trimY": 1749, + "trimX": 1530, + "trimY": 940, "width": 50, "height": 86, "rawWidth": 104, @@ -5171,8 +5171,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1017, - "trimY": 1421, + "trimX": 1813, + "trimY": 728, "width": 48, "height": 84, "rawWidth": 104, @@ -5214,11 +5214,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": -2, - "trimX": 1082, - "trimY": 1789, + "trimX": 1901, + "trimY": 955, "width": 48, "height": 64, "rawWidth": 104, @@ -5263,8 +5263,8 @@ "rotated": true, "offsetX": 19, "offsetY": -16, - "trimX": 201, - "trimY": 1002, + "trimX": 637, + "trimY": 849, "width": 10, "height": 30, "rawWidth": 104, @@ -5306,11 +5306,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -2, "offsetY": -2, - "trimX": 1116, - "trimY": 626, + "trimX": 170, + "trimY": 1014, "width": 125, "height": 63, "rawWidth": 129, @@ -5355,8 +5355,8 @@ "rotated": true, "offsetX": 4, "offsetY": -1, - "trimX": 1114, - "trimY": 862, + "trimX": 1658, + "trimY": 434, "width": 113, "height": 65, "rawWidth": 129, @@ -5401,8 +5401,8 @@ "rotated": false, "offsetX": 9, "offsetY": -3, - "trimX": 983, - "trimY": 403, + "trimX": 1535, + "trimY": 796, "width": 103, "height": 59, "rawWidth": 129, @@ -5444,11 +5444,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 8, "offsetY": -1, - "trimX": 1116, - "trimY": 753, + "trimX": 1326, + "trimY": 1014, "width": 107, "height": 63, "rawWidth": 129, @@ -5490,11 +5490,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 14, "offsetY": -2, - "trimX": 928, - "trimY": 1269, + "trimX": 1723, + "trimY": 549, "width": 95, "height": 67, "rawWidth": 129, @@ -5536,11 +5536,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 17, "offsetY": -3, - "trimX": 933, - "trimY": 1987, + "trimX": 539, + "trimY": 990, "width": 87, "height": 55, "rawWidth": 129, @@ -5582,11 +5582,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 8, "offsetY": -1, - "trimX": 1116, - "trimY": 753, + "trimX": 1326, + "trimY": 1014, "width": 107, "height": 63, "rawWidth": 129, @@ -5631,8 +5631,8 @@ "rotated": true, "offsetX": 10, "offsetY": 8, - "trimX": 1121, - "trimY": 1527, + "trimX": 1362, + "trimY": 124, "width": 13, "height": 17, "rawWidth": 39, @@ -5674,11 +5674,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 4, "offsetY": -7, - "trimX": 787, - "trimY": 2014, + "trimX": 2017, + "trimY": 612, "width": 25, "height": 41, "rawWidth": 39, @@ -5723,8 +5723,8 @@ "rotated": true, "offsetX": 3, "offsetY": -10, - "trimX": 234, - "trimY": 704, + "trimX": 1979, + "trimY": 918, "width": 33, "height": 61, "rawWidth": 39, @@ -5766,11 +5766,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 3, - "trimX": 725, - "trimY": 706, + "trimX": 1572, + "trimY": 992, "width": 39, "height": 85, "rawWidth": 39, @@ -5812,11 +5812,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 2, - "trimX": 1033, - "trimY": 1471, + "trimX": 1613, + "trimY": 992, "width": 39, "height": 85, "rawWidth": 39, @@ -5858,11 +5858,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 2, - "trimX": 1037, - "trimY": 1635, + "trimX": 1654, + "trimY": 893, "width": 35, "height": 85, "rawWidth": 39, @@ -5904,11 +5904,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 9, - "trimX": 1132, - "trimY": 1789, + "trimX": 1838, + "trimY": 916, "width": 33, "height": 71, "rawWidth": 39, @@ -5950,11 +5950,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 9, "offsetY": 8, - "trimX": 451, - "trimY": 1111, + "trimX": 692, + "trimY": 243, "width": 15, "height": 19, "rawWidth": 39, @@ -5996,11 +5996,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 4, "offsetY": -7, - "trimX": 972, - "trimY": 612, + "trimX": 1615, + "trimY": 857, "width": 23, "height": 41, "rawWidth": 39, @@ -6042,11 +6042,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 3, "offsetY": -9, - "trimX": 1116, - "trimY": 1065, + "trimX": 483, + "trimY": 423, "width": 33, "height": 63, "rawWidth": 39, @@ -6091,8 +6091,8 @@ "rotated": false, "offsetX": 0, "offsetY": 3, - "trimX": 1038, - "trimY": 1893, + "trimX": 1792, + "trimY": 548, "width": 39, "height": 85, "rawWidth": 39, @@ -6137,8 +6137,8 @@ "rotated": false, "offsetX": 0, "offsetY": 2, - "trimX": 1140, - "trimY": 1464, + "trimX": 1792, + "trimY": 635, "width": 39, "height": 85, "rawWidth": 39, @@ -6180,11 +6180,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 3, - "trimX": 1061, - "trimY": 1750, + "trimX": 1654, + "trimY": 980, "width": 37, "height": 85, "rawWidth": 39, @@ -6226,11 +6226,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 2, - "trimX": 1045, - "trimY": 1793, + "trimX": 1899, + "trimY": 734, "width": 35, "height": 85, "rawWidth": 39, @@ -6272,11 +6272,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 9, - "trimX": 1103, - "trimY": 1429, + "trimX": 2008, + "trimY": 983, "width": 33, "height": 73, "rawWidth": 39, @@ -6318,11 +6318,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 8, "offsetY": 10, - "trimX": 483, - "trimY": 418, + "trimX": 1454, + "trimY": 289, "width": 15, "height": 55, "rawWidth": 39, @@ -6367,8 +6367,8 @@ "rotated": true, "offsetX": -60, "offsetY": -36, - "trimX": 688, - "trimY": 2015, + "trimX": 1982, + "trimY": 831, "width": 30, "height": 60, "rawWidth": 154, @@ -6410,11 +6410,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -55, "offsetY": -23, - "trimX": 1079, - "trimY": 1901, + "trimX": 799, + "trimY": 744, "width": 42, "height": 68, "rawWidth": 154, @@ -6456,11 +6456,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -15, "offsetY": -6, - "trimX": 777, - "trimY": 1894, + "trimX": 711, + "trimY": 985, "width": 118, "height": 92, "rawWidth": 154, @@ -6502,11 +6502,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -11, "offsetY": -1, - "trimX": 397, - "trimY": 1241, + "trimX": 1284, + "trimY": 600, "width": 130, "height": 84, "rawWidth": 154, @@ -6551,8 +6551,8 @@ "rotated": false, "offsetX": -7, "offsetY": 3, - "trimX": 732, - "trimY": 442, + "trimX": 663, + "trimY": 570, "width": 134, "height": 94, "rawWidth": 154, @@ -6597,8 +6597,8 @@ "rotated": false, "offsetX": -1, "offsetY": 2, - "trimX": 503, - "trimY": 578, + "trimX": 1170, + "trimY": 330, "width": 140, "height": 102, "rawWidth": 154, @@ -6643,8 +6643,8 @@ "rotated": false, "offsetX": 2, "offsetY": 1, - "trimX": 503, - "trimY": 464, + "trimX": 849, + "trimY": 507, "width": 140, "height": 112, "rawWidth": 154, @@ -6689,8 +6689,8 @@ "rotated": false, "offsetX": 5, "offsetY": 2, - "trimX": 726, - "trimY": 254, + "trimX": 657, + "trimY": 454, "width": 140, "height": 114, "rawWidth": 154, @@ -6735,8 +6735,8 @@ "rotated": false, "offsetX": 28, "offsetY": 11, - "trimX": 829, - "trimY": 1360, + "trimX": 1535, + "trimY": 698, "width": 96, "height": 96, "rawWidth": 154, @@ -6781,8 +6781,8 @@ "rotated": false, "offsetX": 43, "offsetY": 21, - "trimX": 1012, - "trimY": 464, + "trimX": 1769, + "trimY": 948, "width": 66, "height": 72, "rawWidth": 154, @@ -6824,11 +6824,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -3, "offsetY": -22, - "trimX": 829, - "trimY": 1458, + "trimX": 1465, + "trimY": 180, "width": 44, "height": 90, "rawWidth": 154, @@ -6870,11 +6870,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -2, "offsetY": -7, - "trimX": 813, - "trimY": 1016, + "trimX": 621, + "trimY": 679, "width": 52, "height": 124, "rawWidth": 154, @@ -6919,8 +6919,8 @@ "rotated": false, "offsetX": -2, "offsetY": -1, - "trimX": 983, - "trimY": 263, + "trimX": 1658, + "trimY": 294, "width": 66, "height": 138, "rawWidth": 154, @@ -6962,11 +6962,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 1, - "trimX": 755, - "trimY": 1360, + "trimX": 1310, + "trimY": 247, "width": 72, "height": 142, "rawWidth": 154, @@ -7011,8 +7011,8 @@ "rotated": true, "offsetX": -2, "offsetY": 3, - "trimX": 628, - "trimY": 968, + "trimX": 849, + "trimY": 413, "width": 92, "height": 148, "rawWidth": 154, @@ -7054,11 +7054,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -2, "offsetY": 1, - "trimX": 563, - "trimY": 1768, + "trimX": 999, + "trimY": 434, "width": 98, "height": 152, "rawWidth": 154, @@ -7103,8 +7103,8 @@ "rotated": true, "offsetX": 0, "offsetY": -2, - "trimX": 614, - "trimY": 1062, + "trimX": 1153, + "trimY": 434, "width": 102, "height": 148, "rawWidth": 154, @@ -7146,11 +7146,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 1, "offsetY": -10, - "trimX": 238, - "trimY": 1135, + "trimX": 875, + "trimY": 743, "width": 104, "height": 132, "rawWidth": 154, @@ -7195,8 +7195,8 @@ "rotated": false, "offsetX": 3, "offsetY": -16, - "trimX": 586, - "trimY": 1922, + "trimX": 1942, + "trimY": 1, "width": 100, "height": 120, "rawWidth": 154, @@ -7238,11 +7238,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -2, "offsetY": -22, - "trimX": 921, - "trimY": 1472, + "trimX": 1683, + "trimY": 549, "width": 38, "height": 110, "rawWidth": 154, @@ -7287,8 +7287,8 @@ "rotated": true, "offsetX": -35, "offsetY": 0, - "trimX": 1, - "trimY": 1901, + "trimX": 799, + "trimY": 454, "width": 144, "height": 48, "rawWidth": 240, @@ -7333,8 +7333,8 @@ "rotated": true, "offsetX": -2, "offsetY": 3, - "trimX": 726, - "trimY": 102, + "trimX": 1059, + "trimY": 1, "width": 91, "height": 325, "rawWidth": 99, @@ -7422,11 +7422,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 1, "offsetY": 0, - "trimX": 1, - "trimY": 1014, + "trimX": 726, + "trimY": 102, "width": 97, "height": 331, "rawWidth": 99, @@ -7514,11 +7514,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 22, "offsetY": -33, - "trimX": 68, - "trimY": 1768, + "trimX": 234, + "trimY": 493, "width": 201, "height": 184, "rawWidth": 277, @@ -7836,11 +7836,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 5, "offsetY": -12, - "trimX": 234, - "trimY": 493, + "trimX": 1386, + "trimY": 72, "width": 209, "height": 65, "rawWidth": 319, @@ -7885,8 +7885,8 @@ "rotated": true, "offsetX": 59, "offsetY": 7, - "trimX": 1025, - "trimY": 1184, + "trimX": 1508, + "trimY": 579, "width": 95, "height": 51, "rawWidth": 319, @@ -7931,8 +7931,8 @@ "rotated": true, "offsetX": 2, "offsetY": -12, - "trimX": 171, - "trimY": 1014, + "trimX": 201, + "trimY": 745, "width": 225, "height": 65, "rawWidth": 319, @@ -7974,11 +7974,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -10, "offsetY": -16, - "trimX": 301, - "trimY": 692, + "trimX": 420, + "trimY": 489, "width": 199, "height": 57, "rawWidth": 319, @@ -8020,11 +8020,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -24, "offsetY": -12, - "trimX": 1, - "trimY": 1650, + "trimX": 1691, + "trimY": 1, "width": 249, "height": 65, "rawWidth": 319, @@ -8070,7 +8070,7 @@ "offsetX": -28, "offsetY": -16, "trimX": 726, - "trimY": 195, + "trimY": 201, "width": 255, "height": 57, "rawWidth": 319, @@ -8112,11 +8112,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -9, "offsetY": -9, - "trimX": 1, - "trimY": 1347, + "trimX": 1059, + "trimY": 94, "width": 301, "height": 71, "rawWidth": 319, @@ -8158,11 +8158,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 19, "offsetY": -16, - "trimX": 201, - "trimY": 745, + "trimX": 1059, + "trimY": 167, "width": 255, "height": 57, "rawWidth": 319, @@ -8204,11 +8204,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 8, "offsetY": -10, - "trimX": 100, - "trimY": 1014, + "trimX": 1386, + "trimY": 1, "width": 303, "height": 69, "rawWidth": 319, @@ -8250,11 +8250,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -90, "offsetY": 20, - "trimX": 830, - "trimY": 1602, + "trimX": 1640, + "trimY": 796, "width": 95, "height": 49, "rawWidth": 319, @@ -8296,11 +8296,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 5, "offsetY": -52, - "trimX": 1025, - "trimY": 1281, + "trimX": 1838, + "trimY": 1015, "width": 64, "height": 51, "rawWidth": 164, @@ -8342,11 +8342,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 8, "offsetY": -32, - "trimX": 779, - "trimY": 1801, + "trimX": 1013, + "trimY": 993, "width": 84, "height": 91, "rawWidth": 164, @@ -8388,11 +8388,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 8, "offsetY": -11, - "trimX": 289, - "trimY": 1241, + "trimX": 528, + "trimY": 571, "width": 106, "height": 133, "rawWidth": 164, @@ -8434,11 +8434,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 5, "offsetY": 0, - "trimX": 1053, - "trimY": 125, + "trimX": 268, + "trimY": 862, "width": 126, "height": 155, "rawWidth": 164, @@ -8480,11 +8480,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 491, - "trimY": 1524, + "trimX": 692, + "trimY": 260, "width": 154, "height": 155, "rawWidth": 164, @@ -8529,8 +8529,8 @@ "rotated": true, "offsetX": 0, "offsetY": -2, - "trimX": 285, - "trimY": 1376, + "trimX": 268, + "trimY": 696, "width": 164, "height": 151, "rawWidth": 164, @@ -8572,11 +8572,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 6, "offsetY": -11, - "trimX": 289, - "trimY": 1241, + "trimX": 528, + "trimY": 571, "width": 106, "height": 133, "rawWidth": 164, @@ -8618,11 +8618,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 16, "offsetY": -32, - "trimX": 779, - "trimY": 1801, + "trimX": 1013, + "trimY": 993, "width": 84, "height": 91, "rawWidth": 164, @@ -8664,11 +8664,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -2, "offsetY": -52, - "trimX": 1025, - "trimY": 1281, + "trimX": 1838, + "trimY": 1015, "width": 64, "height": 51, "rawWidth": 164, @@ -8713,8 +8713,8 @@ "rotated": false, "offsetX": -1, "offsetY": -5, - "trimX": 1082, - "trimY": 1855, + "trimX": 1693, + "trimY": 1033, "width": 44, "height": 44, "rawWidth": 70, @@ -8759,8 +8759,8 @@ "rotated": false, "offsetX": -1, "offsetY": -5, - "trimX": 1128, - "trimY": 1862, + "trimX": 1904, + "trimY": 1005, "width": 50, "height": 50, "rawWidth": 70, @@ -8802,11 +8802,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 1, "offsetY": -4, - "trimX": 1140, - "trimY": 1695, + "trimX": 234, + "trimY": 696, "width": 34, "height": 32, "rawWidth": 70, @@ -8851,8 +8851,8 @@ "rotated": false, "offsetX": 0, "offsetY": -5, - "trimX": 1020, - "trimY": 538, + "trimX": 1753, + "trimY": 733, "width": 58, "height": 60, "rawWidth": 70, @@ -8897,8 +8897,8 @@ "rotated": false, "offsetX": -1, "offsetY": -4, - "trimX": 1060, - "trimY": 1119, + "trimX": 1837, + "trimY": 951, "width": 62, "height": 62, "rawWidth": 70, @@ -8943,8 +8943,8 @@ "rotated": true, "offsetX": 1, "offsetY": 0, - "trimX": 997, - "trimY": 1612, + "trimX": 637, + "trimY": 805, "width": 42, "height": 38, "rawWidth": 70, @@ -8989,8 +8989,8 @@ "rotated": false, "offsetX": 0, "offsetY": -2, - "trimX": 983, - "trimY": 195, + "trimX": 1912, + "trimY": 771, "width": 68, "height": 66, "rawWidth": 70, @@ -9035,8 +9035,8 @@ "rotated": true, "offsetX": -1, "offsetY": -4, - "trimX": 871, - "trimY": 1987, + "trimX": 1982, + "trimY": 771, "width": 58, "height": 60, "rawWidth": 70, @@ -9081,8 +9081,8 @@ "rotated": false, "offsetX": 0, "offsetY": -4, - "trimX": 671, - "trimY": 692, + "trimX": 821, + "trimY": 911, "width": 52, "height": 54, "rawWidth": 70, @@ -9127,8 +9127,8 @@ "rotated": false, "offsetX": -1, "offsetY": -4, - "trimX": 1123, - "trimY": 1914, + "trimX": 1956, + "trimY": 1005, "width": 50, "height": 50, "rawWidth": 70, @@ -9173,8 +9173,8 @@ "rotated": false, "offsetX": 0, "offsetY": -5, - "trimX": 1038, - "trimY": 1980, + "trimX": 1739, + "trimY": 1033, "width": 44, "height": 44, "rawWidth": 70, @@ -9219,8 +9219,8 @@ "rotated": false, "offsetX": -1, "offsetY": -5, - "trimX": 1121, - "trimY": 1551, + "trimX": 201, + "trimY": 972, "width": 40, "height": 40, "rawWidth": 70, @@ -9265,8 +9265,8 @@ "rotated": false, "offsetX": -1, "offsetY": -5, - "trimX": 1123, - "trimY": 1966, + "trimX": 1986, + "trimY": 737, "width": 32, "height": 32, "rawWidth": 70, @@ -9311,8 +9311,8 @@ "rotated": false, "offsetX": -1, "offsetY": -5, - "trimX": 791, - "trimY": 930, + "trimX": 1147, + "trimY": 330, "width": 18, "height": 18, "rawWidth": 70, @@ -9354,11 +9354,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": -1, - "trimX": 934, - "trimY": 709, + "trimX": 1222, + "trimY": 806, "width": 111, "height": 89, "rawWidth": 113, @@ -9400,11 +9400,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": -1, - "trimX": 1025, - "trimY": 709, + "trimX": 1839, + "trimY": 430, "width": 111, "height": 89, "rawWidth": 113, @@ -9449,8 +9449,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 813, - "trimY": 923, + "trimX": 1335, + "trimY": 804, "width": 111, "height": 91, "rawWidth": 113, @@ -9492,11 +9492,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 846, - "trimY": 1070, + "trimX": 1839, + "trimY": 337, "width": 111, "height": 91, "rawWidth": 113, @@ -9541,8 +9541,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 51, - "trimY": 1954, + "trimX": 596, + "trimY": 986, "width": 113, "height": 91, "rawWidth": 113, @@ -9587,8 +9587,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 166, - "trimY": 1954, + "trimX": 1739, + "trimY": 150, "width": 113, "height": 91, "rawWidth": 113, @@ -9633,8 +9633,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 868, - "trimY": 371, + "trimX": 1739, + "trimY": 243, "width": 113, "height": 91, "rawWidth": 113, @@ -9676,11 +9676,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": -2, - "trimX": 1025, - "trimY": 822, + "trimX": 426, + "trimY": 990, "width": 111, "height": 87, "rawWidth": 113, @@ -9725,8 +9725,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 912, - "trimY": 1512, + "trimX": 1530, + "trimY": 857, "width": 83, "height": 81, "rawWidth": 83, @@ -9771,8 +9771,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 468, - "trimY": 1111, + "trimX": 528, + "trimY": 442, "width": 127, "height": 127, "rawWidth": 127, @@ -9814,11 +9814,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": -17, - "trimX": 714, - "trimY": 1360, + "trimX": 1362, + "trimY": 139, "width": 147, "height": 39, "rawWidth": 167, @@ -9863,8 +9863,8 @@ "rotated": true, "offsetX": -1, "offsetY": -13, - "trimX": 683, - "trimY": 456, + "trimX": 479, + "trimY": 489, "width": 147, "height": 47, "rawWidth": 167, @@ -9906,11 +9906,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": -4, - "trimX": 647, - "trimY": 1360, + "trimX": 991, + "trimY": 618, "width": 147, "height": 65, "rawWidth": 167, @@ -9952,11 +9952,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": -4, - "trimX": 647, - "trimY": 1509, + "trimX": 1316, + "trimY": 180, "width": 147, "height": 65, "rawWidth": 167, @@ -10001,8 +10001,8 @@ "rotated": true, "offsetX": -1, "offsetY": -4, - "trimX": 714, - "trimY": 1509, + "trimX": 1423, + "trimY": 437, "width": 147, "height": 65, "rawWidth": 167, @@ -10047,8 +10047,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1037, - "trimY": 1512, + "trimX": 929, + "trimY": 995, "width": 82, "height": 82, "rawWidth": 82, diff --git a/assets/resources/game/skills/skills.png b/assets/resources/game/skills/skills.png index 9b812fc3..47efce15 100644 Binary files a/assets/resources/game/skills/skills.png and b/assets/resources/game/skills/skills.png differ diff --git a/assets/script/game/hero/BuffComp.ts b/assets/script/game/hero/BuffComp.ts index e3abfb4d..4555db20 100644 --- a/assets/script/game/hero/BuffComp.ts +++ b/assets/script/game/hero/BuffComp.ts @@ -199,7 +199,7 @@ export class BuffComp extends Component { var prefab: Prefab = oops.res.get(path, Prefab)!; var node = instantiate(prefab); let pos = v3(this.node.position.x,this.node.position.y+30,this.node.position.z); - node.parent = this.node; + node.parent = this.node.parent; node.setPosition(pos); } in_atked() { @@ -254,7 +254,7 @@ export class BuffComp extends Component { tooltip(type:number=1,value:string="",s_uuid:number=1001,y:number=90){ // console.log("tooltip",type); let tip =ecs.getEntity(Tooltip); - let pos = v3(0,0); + let pos = v3(0,10); pos.y=pos.y+y; tip.load(pos,type,value,s_uuid,this.node); }