diff --git a/assets/resources/gui/ui7.plist b/assets/resources/gui/ui7.plist index d2d4a482..993ea359 100644 --- a/assets/resources/gui/ui7.plist +++ b/assets/resources/gui/ui7.plist @@ -34,7 +34,7 @@ spriteSourceSize {100,100} textureRect - {{103,103},{100,100}} + {{919,1},{100,100}} textureRotated @@ -51,7 +51,7 @@ spriteSourceSize {100,100} textureRect - {{1,1531},{100,100}} + {{511,817},{100,100}} textureRotated @@ -68,7 +68,7 @@ spriteSourceSize {100,100} textureRect - {{1,1633},{100,100}} + {{613,817},{100,100}} textureRotated @@ -85,7 +85,7 @@ spriteSourceSize {100,100} textureRect - {{1,1735},{100,100}} + {{715,817},{100,100}} textureRotated @@ -102,7 +102,7 @@ spriteSourceSize {100,100} textureRect - {{1,1837},{100,100}} + {{817,817},{100,100}} textureRotated @@ -119,7 +119,7 @@ spriteSourceSize {100,100} textureRect - {{103,1225},{100,100}} + {{919,817},{100,100}} textureRotated @@ -136,7 +136,7 @@ spriteSourceSize {100,100} textureRect - {{205,1225},{100,100}} + {{205,919},{100,100}} textureRotated @@ -153,7 +153,7 @@ spriteSourceSize {100,100} textureRect - {{307,1225},{100,100}} + {{205,1021},{100,100}} textureRotated @@ -170,7 +170,7 @@ spriteSourceSize {100,100} textureRect - {{409,1225},{100,100}} + {{205,1123},{100,100}} textureRotated @@ -187,7 +187,7 @@ spriteSourceSize {100,100} textureRect - {{511,1225},{100,100}} + {{205,1225},{100,100}} textureRotated @@ -204,7 +204,7 @@ spriteSourceSize {100,100} textureRect - {{613,1225},{100,100}} + {{205,1327},{100,100}} textureRotated @@ -221,7 +221,7 @@ spriteSourceSize {100,100} textureRect - {{205,103},{100,100}} + {{1,103},{100,100}} textureRotated @@ -238,7 +238,7 @@ spriteSourceSize {100,100} textureRect - {{715,1225},{100,100}} + {{205,1429},{100,100}} textureRotated @@ -255,7 +255,7 @@ spriteSourceSize {100,100} textureRect - {{103,1327},{100,100}} + {{205,1531},{100,100}} textureRotated @@ -272,7 +272,7 @@ spriteSourceSize {100,100} textureRect - {{103,1429},{100,100}} + {{307,919},{100,100}} textureRotated @@ -289,7 +289,7 @@ spriteSourceSize {100,100} textureRect - {{103,1531},{100,100}} + {{409,919},{100,100}} textureRotated @@ -306,7 +306,7 @@ spriteSourceSize {100,100} textureRect - {{103,1633},{100,100}} + {{511,919},{100,100}} textureRotated @@ -323,7 +323,7 @@ spriteSourceSize {100,100} textureRect - {{103,1735},{100,100}} + {{613,919},{100,100}} textureRotated @@ -340,7 +340,7 @@ spriteSourceSize {100,100} textureRect - {{103,1837},{100,100}} + {{715,919},{100,100}} textureRotated @@ -357,7 +357,7 @@ spriteSourceSize {100,100} textureRect - {{205,1327},{100,100}} + {{817,919},{100,100}} textureRotated @@ -374,7 +374,7 @@ spriteSourceSize {100,100} textureRect - {{307,1327},{100,100}} + {{919,919},{100,100}} textureRotated @@ -391,7 +391,7 @@ spriteSourceSize {100,100} textureRect - {{409,1327},{100,100}} + {{307,1021},{100,100}} textureRotated @@ -408,7 +408,7 @@ spriteSourceSize {100,100} textureRect - {{307,103},{100,100}} + {{103,103},{100,100}} textureRotated @@ -425,7 +425,7 @@ spriteSourceSize {100,100} textureRect - {{511,1327},{100,100}} + {{307,1123},{100,100}} textureRotated @@ -442,7 +442,7 @@ spriteSourceSize {100,100} textureRect - {{613,1327},{100,100}} + {{307,1225},{100,100}} textureRotated @@ -459,7 +459,7 @@ spriteSourceSize {100,100} textureRect - {{715,1327},{100,100}} + {{307,1327},{100,100}} textureRotated @@ -476,7 +476,7 @@ spriteSourceSize {100,100} textureRect - {{205,1429},{100,100}} + {{307,1429},{100,100}} textureRotated @@ -493,7 +493,7 @@ spriteSourceSize {100,100} textureRect - {{205,1531},{100,100}} + {{307,1531},{100,100}} textureRotated @@ -510,7 +510,7 @@ spriteSourceSize {100,100} textureRect - {{205,1633},{100,100}} + {{409,1021},{100,100}} textureRotated @@ -527,7 +527,7 @@ spriteSourceSize {100,100} textureRect - {{205,1735},{100,100}} + {{511,1021},{100,100}} textureRotated @@ -544,7 +544,7 @@ spriteSourceSize {100,100} textureRect - {{205,1837},{100,100}} + {{613,1021},{100,100}} textureRotated @@ -561,7 +561,7 @@ spriteSourceSize {100,100} textureRect - {{307,1429},{100,100}} + {{715,1021},{100,100}} textureRotated @@ -578,7 +578,7 @@ spriteSourceSize {100,100} textureRect - {{409,1429},{100,100}} + {{817,1021},{100,100}} textureRotated @@ -595,7 +595,7 @@ spriteSourceSize {100,100} textureRect - {{409,103},{100,100}} + {{205,103},{100,100}} textureRotated @@ -612,7 +612,7 @@ spriteSourceSize {100,100} textureRect - {{511,1429},{100,100}} + {{919,1021},{100,100}} textureRotated @@ -629,7 +629,7 @@ spriteSourceSize {100,100} textureRect - {{613,1429},{100,100}} + {{409,1123},{100,100}} textureRotated @@ -646,7 +646,7 @@ spriteSourceSize {100,100} textureRect - {{715,1429},{100,100}} + {{409,1225},{100,100}} textureRotated @@ -663,7 +663,7 @@ spriteSourceSize {100,100} textureRect - {{307,1531},{100,100}} + {{409,1327},{100,100}} textureRotated @@ -680,7 +680,7 @@ spriteSourceSize {100,100} textureRect - {{307,1633},{100,100}} + {{409,1429},{100,100}} textureRotated @@ -697,7 +697,7 @@ spriteSourceSize {100,100} textureRect - {{307,1735},{100,100}} + {{409,1531},{100,100}} textureRotated @@ -714,7 +714,7 @@ spriteSourceSize {100,100} textureRect - {{307,1837},{100,100}} + {{511,1123},{100,100}} textureRotated @@ -731,7 +731,7 @@ spriteSourceSize {100,100} textureRect - {{409,1531},{100,100}} + {{613,1123},{100,100}} textureRotated @@ -748,7 +748,7 @@ spriteSourceSize {100,100} textureRect - {{511,1531},{100,100}} + {{715,1123},{100,100}} textureRotated @@ -765,7 +765,7 @@ spriteSourceSize {100,100} textureRect - {{613,1531},{100,100}} + {{817,1123},{100,100}} textureRotated @@ -782,7 +782,7 @@ spriteSourceSize {100,100} textureRect - {{511,103},{100,100}} + {{307,103},{100,100}} textureRotated @@ -799,7 +799,7 @@ spriteSourceSize {100,100} textureRect - {{715,1531},{100,100}} + {{919,1123},{100,100}} textureRotated @@ -816,7 +816,7 @@ spriteSourceSize {100,100} textureRect - {{409,1633},{100,100}} + {{511,1225},{100,100}} textureRotated @@ -833,7 +833,7 @@ spriteSourceSize {100,100} textureRect - {{409,1735},{100,100}} + {{511,1327},{100,100}} textureRotated @@ -850,7 +850,7 @@ spriteSourceSize {100,100} textureRect - {{409,1837},{100,100}} + {{511,1429},{100,100}} textureRotated @@ -867,7 +867,7 @@ spriteSourceSize {100,100} textureRect - {{511,1633},{100,100}} + {{511,1531},{100,100}} textureRotated @@ -884,7 +884,7 @@ spriteSourceSize {100,100} textureRect - {{613,1633},{100,100}} + {{613,1225},{100,100}} textureRotated @@ -901,7 +901,7 @@ spriteSourceSize {100,100} textureRect - {{715,1633},{100,100}} + {{715,1225},{100,100}} textureRotated @@ -918,7 +918,7 @@ spriteSourceSize {100,100} textureRect - {{511,1735},{100,100}} + {{817,1225},{100,100}} textureRotated @@ -935,7 +935,7 @@ spriteSourceSize {100,100} textureRect - {{511,1837},{100,100}} + {{919,1225},{100,100}} textureRotated @@ -952,7 +952,7 @@ spriteSourceSize {100,100} textureRect - {{613,1735},{100,100}} + {{613,1327},{100,100}} textureRotated @@ -969,7 +969,7 @@ spriteSourceSize {100,100} textureRect - {{613,103},{100,100}} + {{409,103},{100,100}} textureRotated @@ -986,7 +986,7 @@ spriteSourceSize {100,100} textureRect - {{715,1735},{100,100}} + {{613,1429},{100,100}} textureRotated @@ -1003,7 +1003,7 @@ spriteSourceSize {100,100} textureRect - {{715,103},{100,100}} + {{511,103},{100,100}} textureRotated @@ -1020,7 +1020,7 @@ spriteSourceSize {100,100} textureRect - {{1,205},{100,100}} + {{613,103},{100,100}} textureRotated @@ -1037,7 +1037,7 @@ spriteSourceSize {100,100} textureRect - {{103,205},{100,100}} + {{715,103},{100,100}} textureRotated @@ -1054,7 +1054,7 @@ spriteSourceSize {100,100} textureRect - {{205,205},{100,100}} + {{817,103},{100,100}} textureRotated @@ -1088,7 +1088,7 @@ spriteSourceSize {100,100} textureRect - {{307,205},{100,100}} + {{919,103},{100,100}} textureRotated @@ -1105,7 +1105,7 @@ spriteSourceSize {100,100} textureRect - {{409,205},{100,100}} + {{1,205},{100,100}} textureRotated @@ -1122,7 +1122,7 @@ spriteSourceSize {100,100} textureRect - {{511,205},{100,100}} + {{103,205},{100,100}} textureRotated @@ -1139,7 +1139,7 @@ spriteSourceSize {100,100} textureRect - {{613,205},{100,100}} + {{205,205},{100,100}} textureRotated @@ -1156,7 +1156,7 @@ spriteSourceSize {100,100} textureRect - {{715,205},{100,100}} + {{307,205},{100,100}} textureRotated @@ -1173,7 +1173,7 @@ spriteSourceSize {100,100} textureRect - {{1,307},{100,100}} + {{409,205},{100,100}} textureRotated @@ -1190,7 +1190,7 @@ spriteSourceSize {100,100} textureRect - {{103,307},{100,100}} + {{511,205},{100,100}} textureRotated @@ -1207,7 +1207,7 @@ spriteSourceSize {100,100} textureRect - {{205,307},{100,100}} + {{613,205},{100,100}} textureRotated @@ -1224,7 +1224,7 @@ spriteSourceSize {100,100} textureRect - {{307,307},{100,100}} + {{715,205},{100,100}} textureRotated @@ -1241,7 +1241,7 @@ spriteSourceSize {100,100} textureRect - {{409,307},{100,100}} + {{817,205},{100,100}} textureRotated @@ -1275,7 +1275,7 @@ spriteSourceSize {100,100} textureRect - {{511,307},{100,100}} + {{919,205},{100,100}} textureRotated @@ -1292,7 +1292,7 @@ spriteSourceSize {100,100} textureRect - {{613,307},{100,100}} + {{1,307},{100,100}} textureRotated @@ -1309,7 +1309,7 @@ spriteSourceSize {100,100} textureRect - {{715,307},{100,100}} + {{103,307},{100,100}} textureRotated @@ -1326,7 +1326,7 @@ spriteSourceSize {100,100} textureRect - {{1,409},{100,100}} + {{205,307},{100,100}} textureRotated @@ -1343,7 +1343,7 @@ spriteSourceSize {100,100} textureRect - {{103,409},{100,100}} + {{307,307},{100,100}} textureRotated @@ -1360,7 +1360,7 @@ spriteSourceSize {100,100} textureRect - {{205,409},{100,100}} + {{409,307},{100,100}} textureRotated @@ -1377,7 +1377,7 @@ spriteSourceSize {100,100} textureRect - {{307,409},{100,100}} + {{511,307},{100,100}} textureRotated @@ -1394,7 +1394,7 @@ spriteSourceSize {100,100} textureRect - {{409,409},{100,100}} + {{613,307},{100,100}} textureRotated @@ -1411,7 +1411,7 @@ spriteSourceSize {100,100} textureRect - {{511,409},{100,100}} + {{715,307},{100,100}} textureRotated @@ -1428,7 +1428,7 @@ spriteSourceSize {100,100} textureRect - {{613,409},{100,100}} + {{817,307},{100,100}} textureRotated @@ -1462,7 +1462,7 @@ spriteSourceSize {100,100} textureRect - {{715,409},{100,100}} + {{919,307},{100,100}} textureRotated @@ -1479,7 +1479,7 @@ spriteSourceSize {100,100} textureRect - {{1,511},{100,100}} + {{1,409},{100,100}} textureRotated @@ -1496,7 +1496,7 @@ spriteSourceSize {100,100} textureRect - {{103,511},{100,100}} + {{103,409},{100,100}} textureRotated @@ -1513,7 +1513,7 @@ spriteSourceSize {100,100} textureRect - {{205,511},{100,100}} + {{205,409},{100,100}} textureRotated @@ -1530,7 +1530,7 @@ spriteSourceSize {100,100} textureRect - {{307,511},{100,100}} + {{307,409},{100,100}} textureRotated @@ -1547,7 +1547,7 @@ spriteSourceSize {100,100} textureRect - {{409,511},{100,100}} + {{409,409},{100,100}} textureRotated @@ -1564,7 +1564,7 @@ spriteSourceSize {100,100} textureRect - {{511,511},{100,100}} + {{511,409},{100,100}} textureRotated @@ -1581,7 +1581,7 @@ spriteSourceSize {100,100} textureRect - {{613,511},{100,100}} + {{613,409},{100,100}} textureRotated @@ -1598,7 +1598,7 @@ spriteSourceSize {100,100} textureRect - {{715,511},{100,100}} + {{715,409},{100,100}} textureRotated @@ -1615,7 +1615,7 @@ spriteSourceSize {100,100} textureRect - {{1,613},{100,100}} + {{817,409},{100,100}} textureRotated @@ -1649,7 +1649,7 @@ spriteSourceSize {100,100} textureRect - {{103,613},{100,100}} + {{919,409},{100,100}} textureRotated @@ -1666,7 +1666,7 @@ spriteSourceSize {100,100} textureRect - {{205,613},{100,100}} + {{1,511},{100,100}} textureRotated @@ -1683,7 +1683,7 @@ spriteSourceSize {100,100} textureRect - {{307,613},{100,100}} + {{103,511},{100,100}} textureRotated @@ -1700,7 +1700,7 @@ spriteSourceSize {100,100} textureRect - {{409,613},{100,100}} + {{205,511},{100,100}} textureRotated @@ -1717,7 +1717,7 @@ spriteSourceSize {100,100} textureRect - {{511,613},{100,100}} + {{307,511},{100,100}} textureRotated @@ -1734,7 +1734,7 @@ spriteSourceSize {100,100} textureRect - {{613,613},{100,100}} + {{409,511},{100,100}} textureRotated @@ -1751,7 +1751,7 @@ spriteSourceSize {100,100} textureRect - {{715,613},{100,100}} + {{511,511},{100,100}} textureRotated @@ -1768,7 +1768,7 @@ spriteSourceSize {100,100} textureRect - {{1,715},{100,100}} + {{613,511},{100,100}} textureRotated @@ -1785,7 +1785,7 @@ spriteSourceSize {100,100} textureRect - {{103,715},{100,100}} + {{715,511},{100,100}} textureRotated @@ -1802,7 +1802,7 @@ spriteSourceSize {100,100} textureRect - {{205,715},{100,100}} + {{817,511},{100,100}} textureRotated @@ -1836,7 +1836,7 @@ spriteSourceSize {100,100} textureRect - {{307,715},{100,100}} + {{919,511},{100,100}} textureRotated @@ -1853,7 +1853,7 @@ spriteSourceSize {100,100} textureRect - {{409,715},{100,100}} + {{1,613},{100,100}} textureRotated @@ -1870,7 +1870,7 @@ spriteSourceSize {100,100} textureRect - {{511,715},{100,100}} + {{103,613},{100,100}} textureRotated @@ -1887,7 +1887,7 @@ spriteSourceSize {100,100} textureRect - {{613,715},{100,100}} + {{205,613},{100,100}} textureRotated @@ -1904,7 +1904,7 @@ spriteSourceSize {100,100} textureRect - {{715,715},{100,100}} + {{307,613},{100,100}} textureRotated @@ -1921,7 +1921,7 @@ spriteSourceSize {100,100} textureRect - {{1,817},{100,100}} + {{409,613},{100,100}} textureRotated @@ -1938,7 +1938,7 @@ spriteSourceSize {100,100} textureRect - {{103,817},{100,100}} + {{511,613},{100,100}} textureRotated @@ -1955,7 +1955,7 @@ spriteSourceSize {100,100} textureRect - {{205,817},{100,100}} + {{613,613},{100,100}} textureRotated @@ -1972,7 +1972,7 @@ spriteSourceSize {100,100} textureRect - {{307,817},{100,100}} + {{715,613},{100,100}} textureRotated @@ -1989,7 +1989,7 @@ spriteSourceSize {100,100} textureRect - {{409,817},{100,100}} + {{817,613},{100,100}} textureRotated @@ -2023,7 +2023,7 @@ spriteSourceSize {100,100} textureRect - {{511,817},{100,100}} + {{919,613},{100,100}} textureRotated @@ -2040,7 +2040,7 @@ spriteSourceSize {100,100} textureRect - {{613,817},{100,100}} + {{1,715},{100,100}} textureRotated @@ -2057,7 +2057,7 @@ spriteSourceSize {100,100} textureRect - {{715,817},{100,100}} + {{1,817},{100,100}} textureRotated @@ -2091,7 +2091,7 @@ spriteSourceSize {100,100} textureRect - {{103,919},{100,100}} + {{1,1021},{100,100}} textureRotated @@ -2108,7 +2108,7 @@ spriteSourceSize {100,100} textureRect - {{205,919},{100,100}} + {{1,1123},{100,100}} textureRotated @@ -2125,7 +2125,7 @@ spriteSourceSize {100,100} textureRect - {{307,919},{100,100}} + {{1,1225},{100,100}} textureRotated @@ -2142,7 +2142,7 @@ spriteSourceSize {100,100} textureRect - {{409,919},{100,100}} + {{1,1327},{100,100}} textureRotated @@ -2159,7 +2159,7 @@ spriteSourceSize {100,100} textureRect - {{511,919},{100,100}} + {{1,1429},{100,100}} textureRotated @@ -2176,7 +2176,7 @@ spriteSourceSize {100,100} textureRect - {{613,919},{100,100}} + {{1,1531},{100,100}} textureRotated @@ -2210,7 +2210,7 @@ spriteSourceSize {100,100} textureRect - {{715,919},{100,100}} + {{103,715},{100,100}} textureRotated @@ -2227,7 +2227,7 @@ spriteSourceSize {100,100} textureRect - {{1,1021},{100,100}} + {{205,715},{100,100}} textureRotated @@ -2244,7 +2244,7 @@ spriteSourceSize {100,100} textureRect - {{103,1021},{100,100}} + {{307,715},{100,100}} textureRotated @@ -2261,7 +2261,7 @@ spriteSourceSize {100,100} textureRect - {{205,1021},{100,100}} + {{409,715},{100,100}} textureRotated @@ -2278,7 +2278,7 @@ spriteSourceSize {100,100} textureRect - {{307,1021},{100,100}} + {{511,715},{100,100}} textureRotated @@ -2295,7 +2295,7 @@ spriteSourceSize {100,100} textureRect - {{409,1021},{100,100}} + {{613,715},{100,100}} textureRotated @@ -2312,7 +2312,7 @@ spriteSourceSize {100,100} textureRect - {{511,1021},{100,100}} + {{715,715},{100,100}} textureRotated @@ -2329,7 +2329,7 @@ spriteSourceSize {100,100} textureRect - {{613,1021},{100,100}} + {{817,715},{100,100}} textureRotated @@ -2346,7 +2346,7 @@ spriteSourceSize {100,100} textureRect - {{715,1021},{100,100}} + {{919,715},{100,100}} textureRotated @@ -2363,7 +2363,7 @@ spriteSourceSize {100,100} textureRect - {{1,1123},{100,100}} + {{103,817},{100,100}} textureRotated @@ -2380,7 +2380,7 @@ spriteSourceSize {100,100} textureRect - {{1,103},{100,100}} + {{817,1},{100,100}} textureRotated @@ -2397,7 +2397,7 @@ spriteSourceSize {100,100} textureRect - {{103,1123},{100,100}} + {{103,919},{100,100}} textureRotated @@ -2414,7 +2414,7 @@ spriteSourceSize {100,100} textureRect - {{205,1123},{100,100}} + {{103,1021},{100,100}} textureRotated @@ -2431,7 +2431,7 @@ spriteSourceSize {100,100} textureRect - {{307,1123},{100,100}} + {{103,1123},{100,100}} textureRotated @@ -2448,7 +2448,7 @@ spriteSourceSize {100,100} textureRect - {{409,1123},{100,100}} + {{103,1225},{100,100}} textureRotated @@ -2465,7 +2465,7 @@ spriteSourceSize {100,100} textureRect - {{511,1123},{100,100}} + {{103,1327},{100,100}} textureRotated @@ -2482,7 +2482,7 @@ spriteSourceSize {100,100} textureRect - {{613,1123},{100,100}} + {{103,1429},{100,100}} textureRotated @@ -2499,7 +2499,7 @@ spriteSourceSize {100,100} textureRect - {{715,1123},{100,100}} + {{103,1531},{100,100}} textureRotated @@ -2516,7 +2516,7 @@ spriteSourceSize {100,100} textureRect - {{1,1225},{100,100}} + {{205,817},{100,100}} textureRotated @@ -2533,7 +2533,7 @@ spriteSourceSize {100,100} textureRect - {{1,1327},{100,100}} + {{307,817},{100,100}} textureRotated @@ -2550,7 +2550,7 @@ spriteSourceSize {100,100} textureRect - {{1,1429},{100,100}} + {{409,817},{100,100}} textureRotated @@ -2563,11 +2563,198 @@ spriteOffset {0,0} spriteSize - {67,68} + {84,85} spriteSourceSize - {67,68} + {84,85} textureRect - {{613,1837},{67,68}} + {{899,1419},{84,85}} + textureRotated + + + g_hunter_dcj_skill.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {90,90} + spriteSourceSize + {90,90} + textureRect + {{613,1531},{90,90}} + textureRotated + + + g_mage_asfd_skill.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {90,90} + spriteSourceSize + {90,90} + textureRect + {{705,1531},{90,90}} + textureRotated + + + g_priest_zldy_skill.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {90,90} + spriteSourceSize + {90,90} + textureRect + {{715,1327},{90,90}} + textureRotated + + + o_hunter_hbj_skill.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {90,90} + spriteSourceSize + {90,90} + textureRect + {{715,1419},{90,90}} + textureRotated + + + o_hunter_lyj_skill.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {90,90} + spriteSourceSize + {90,90} + textureRect + {{797,1511},{90,90}} + textureRotated + + + o_hunter_slsj_skill.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {90,90} + spriteSourceSize + {90,90} + textureRect + {{797,1603},{90,90}} + textureRotated + + + o_mage_yss_skill.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {90,90} + spriteSourceSize + {90,90} + textureRect + {{807,1327},{90,90}} + textureRotated + + + o_warlock_hyzy_skill.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {90,90} + spriteSourceSize + {90,90} + textureRect + {{807,1419},{90,90}} + textureRotated + + + o_warrior_bsxz_skill.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {90,90} + spriteSourceSize + {90,90} + textureRect + {{889,1511},{90,90}} + textureRotated + + + p_druid_zrzl_skill.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {90,90} + spriteSourceSize + {90,90} + textureRect + {{889,1603},{90,90}} + textureRotated + + + p_paladin_zyfc_skill.png + + aliases + + anchor + {0.5,0.5} + spriteOffset + {0,0} + spriteSize + {90,90} + spriteSourceSize + {90,90} + textureRect + {{899,1327},{90,90}} textureRotated @@ -2583,9 +2770,9 @@ realTextureFileName ui7.png size - {816,1938} + {1020,1694} smartupdate - $TexturePacker:SmartUpdate:407e9768bc87b068abe5182adaa7dca3:7789307518a802f986710e03f20d2883:1a112c7b054ba169b4d1467b2c470cae$ + $TexturePacker:SmartUpdate:f24855fdb2b27d629f652b8549363b4d:1809775d0ece2c73ae7eaed1ec0831d8:1a112c7b054ba169b4d1467b2c470cae$ textureFileName ui7.png diff --git a/assets/resources/gui/ui7.png b/assets/resources/gui/ui7.png index 91239a35..acb2c858 100644 Binary files a/assets/resources/gui/ui7.png and b/assets/resources/gui/ui7.png differ diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index 9476f73c..229a2359 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -89,6 +89,9 @@ export class SingletonModuleComp extends ecs.Comp { /** 全局缓存的通用图集 */ uiconsAtlas: SpriteAtlas | null = null; + /** 全局缓存的技能图标图集(gui/ui7,SinfoComp/TalentItemComp/SSkillBoxComp 专用) */ + skillIconsAtlas: SpriteAtlas | null = null; + mission: any = { status: 0, //0:未开始 1:进行中 2:胜利 3:失败 play: false, diff --git a/assets/script/game/map/SSkillBoxComp.ts b/assets/script/game/map/SSkillBoxComp.ts index dc93d09d..b8e0beb7 100644 --- a/assets/script/game/map/SSkillBoxComp.ts +++ b/assets/script/game/map/SSkillBoxComp.ts @@ -253,8 +253,9 @@ export class SSkillBoxComp extends CCComp { } if (this.icon_node && this.icon_node.isValid) { let sprite = this.icon_node.getComponent(Sprite) || this.icon_node.addComponent(Sprite); - if (smc.uiconsAtlas && iconId) { - const frame = smc.uiconsAtlas.getSpriteFrame(iconId); + // 技能图标统一走 gui/ui7 图集缓存 + if (smc.skillIconsAtlas && iconId) { + const frame = smc.skillIconsAtlas.getSpriteFrame(iconId); sprite.spriteFrame = frame || null; // 取不到时清空,避免残留 } else { sprite.spriteFrame = null; diff --git a/assets/script/game/map/SinfoComp.ts b/assets/script/game/map/SinfoComp.ts index 43bb7b83..bd495eac 100644 --- a/assets/script/game/map/SinfoComp.ts +++ b/assets/script/game/map/SinfoComp.ts @@ -361,8 +361,9 @@ export class SinfoComp extends CCComp { if (!this.icon_node || !this.icon_node.isValid) return; const iconId = p.card_icon ?? this.resolveIconId(p); let sprite = this.icon_node.getComponent(Sprite) || this.icon_node.addComponent(Sprite); - if (smc.uiconsAtlas && iconId) { - const frame = smc.uiconsAtlas.getSpriteFrame(iconId); + // 技能图标统一走 gui/ui7 图集缓存 + if (smc.skillIconsAtlas && iconId) { + const frame = smc.skillIconsAtlas.getSpriteFrame(iconId); sprite.spriteFrame = frame || null; } else { sprite.spriteFrame = null; diff --git a/assets/script/game/map/TalentItemComp.ts b/assets/script/game/map/TalentItemComp.ts index 6d1f4e68..8dce46f2 100644 --- a/assets/script/game/map/TalentItemComp.ts +++ b/assets/script/game/map/TalentItemComp.ts @@ -91,11 +91,11 @@ export class TalentItemComp extends CCComp { // 阶位背景:激活对应颜色子节点(Ⅰ蓝 / Ⅱ红 / Ⅲ金) if (this.bg) this.applyTierBg(cfg.tier, inactive); - // 图标:uiconsAtlas 优先,资源目录回退(与 TalentItemComp 旧版/SCardComp 口径一致) + // 图标:技能图标图集(gui/ui7)优先,资源目录回退(与 SCardComp 口径一致) if (this.icon && cfg.icon) { let frame: SpriteFrame | null = null; - if (smc.uiconsAtlas) { - frame = smc.uiconsAtlas.getSpriteFrame(cfg.icon); + if (smc.skillIconsAtlas) { + frame = smc.skillIconsAtlas.getSpriteFrame(cfg.icon); } if (!frame) { frame = oops.res.get("game/heros/cards/" + cfg.icon, SpriteFrame) as SpriteFrame;