diff --git a/assets/resources/game/heros/hero/k5m5.plist b/assets/resources/game/heros/hero/k5m5.plist index b706d897..326128a4 100644 --- a/assets/resources/game/heros/hero/k5m5.plist +++ b/assets/resources/game/heros/hero/k5m5.plist @@ -11,11 +11,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1297,1},{160,128}} + {{1,1},{128,128}} textureRotated @@ -26,11 +26,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1459,1},{160,128}} + {{131,1},{128,128}} textureRotated @@ -41,11 +41,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1621,1},{160,128}} + {{261,1},{128,128}} textureRotated @@ -56,11 +56,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1783,1},{160,128}} + {{391,1},{128,128}} textureRotated @@ -71,11 +71,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1,116},{160,128}} + {{521,1},{128,128}} textureRotated @@ -86,11 +86,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{163,116},{160,128}} + {{651,1},{128,128}} textureRotated @@ -101,11 +101,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{325,116},{160,128}} + {{781,1},{128,128}} textureRotated @@ -116,11 +116,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{487,116},{160,128}} + {{911,1},{128,128}} textureRotated @@ -131,11 +131,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{649,116},{160,128}} + {{1041,1},{128,128}} textureRotated @@ -146,11 +146,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{811,116},{160,128}} + {{1171,1},{128,128}} textureRotated @@ -161,11 +161,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{325,246},{160,128}} + {{391,131},{128,128}} textureRotated @@ -176,11 +176,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{487,246},{160,128}} + {{521,131},{128,128}} textureRotated @@ -191,11 +191,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{649,246},{160,128}} + {{651,131},{128,128}} textureRotated @@ -206,11 +206,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{811,246},{160,128}} + {{781,131},{128,128}} textureRotated @@ -221,11 +221,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{973,116},{160,128}} + {{1301,1},{128,128}} textureRotated @@ -236,11 +236,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1135,116},{160,128}} + {{1431,1},{128,128}} textureRotated @@ -251,11 +251,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1297,131},{160,128}} + {{1561,1},{128,128}} textureRotated @@ -266,11 +266,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1459,131},{160,128}} + {{1691,1},{128,128}} textureRotated @@ -281,11 +281,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1621,131},{160,128}} + {{1821,1},{128,128}} textureRotated @@ -296,11 +296,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1783,131},{160,128}} + {{1,131},{128,128}} textureRotated @@ -311,11 +311,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1,246},{160,128}} + {{131,131},{128,128}} textureRotated @@ -326,11 +326,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{163,246},{160,128}} + {{261,131},{128,128}} textureRotated @@ -341,11 +341,11 @@ spriteOffset {0,0} spriteSize - {160,113} + {128,128} spriteSourceSize - {160,113} + {128,128} textureRect - {{1,1},{160,113}} + {{911,131},{128,128}} textureRotated @@ -356,11 +356,11 @@ spriteOffset {0,0} spriteSize - {160,113} + {128,128} spriteSourceSize - {160,113} + {128,128} textureRect - {{1,1},{160,113}} + {{911,131},{128,128}} textureRotated @@ -371,11 +371,11 @@ spriteOffset {0,0} spriteSize - {160,113} + {128,128} spriteSourceSize - {160,113} + {128,128} textureRect - {{163,1},{160,113}} + {{1041,131},{128,128}} textureRotated @@ -386,11 +386,11 @@ spriteOffset {0,0} spriteSize - {160,113} + {128,128} spriteSourceSize - {160,113} + {128,128} textureRect - {{325,1},{160,113}} + {{1171,131},{128,128}} textureRotated @@ -401,11 +401,11 @@ spriteOffset {0,0} spriteSize - {160,113} + {128,128} spriteSourceSize - {160,113} + {128,128} textureRect - {{487,1},{160,113}} + {{1301,131},{128,128}} textureRotated @@ -416,11 +416,11 @@ spriteOffset {0,0} spriteSize - {160,113} + {128,128} spriteSourceSize - {160,113} + {128,128} textureRect - {{649,1},{160,113}} + {{1431,131},{128,128}} textureRotated @@ -431,11 +431,11 @@ spriteOffset {0,0} spriteSize - {160,113} + {128,128} spriteSourceSize - {160,113} + {128,128} textureRect - {{811,1},{160,113}} + {{1561,131},{128,128}} textureRotated @@ -446,11 +446,11 @@ spriteOffset {0,0} spriteSize - {160,113} + {128,128} spriteSourceSize - {160,113} + {128,128} textureRect - {{973,1},{160,113}} + {{1691,131},{128,128}} textureRotated @@ -461,11 +461,11 @@ spriteOffset {0,0} spriteSize - {160,113} + {128,128} spriteSourceSize - {160,113} + {128,128} textureRect - {{1135,1},{160,113}} + {{1821,131},{128,128}} textureRotated @@ -476,11 +476,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{973,246},{160,128}} + {{1,261},{128,128}} textureRotated @@ -491,11 +491,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1135,246},{160,128}} + {{131,261},{128,128}} textureRotated @@ -506,11 +506,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1297,261},{160,128}} + {{261,261},{128,128}} textureRotated @@ -521,11 +521,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1459,261},{160,128}} + {{391,261},{128,128}} textureRotated @@ -536,11 +536,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1621,261},{160,128}} + {{521,261},{128,128}} textureRotated @@ -551,11 +551,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1783,261},{160,128}} + {{651,261},{128,128}} textureRotated @@ -566,11 +566,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1297,1},{160,128}} + {{1,1},{128,128}} textureRotated @@ -581,11 +581,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1,376},{160,128}} + {{781,261},{128,128}} textureRotated @@ -596,11 +596,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{163,376},{160,128}} + {{911,261},{128,128}} textureRotated @@ -611,11 +611,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{325,376},{160,128}} + {{1041,261},{128,128}} textureRotated @@ -626,11 +626,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{487,376},{160,128}} + {{1171,261},{128,128}} textureRotated @@ -641,11 +641,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{649,376},{160,128}} + {{1301,261},{128,128}} textureRotated @@ -656,11 +656,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{811,376},{160,128}} + {{1431,261},{128,128}} textureRotated @@ -671,11 +671,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{973,376},{160,128}} + {{1561,261},{128,128}} textureRotated @@ -686,11 +686,11 @@ spriteOffset {0,0} spriteSize - {160,128} + {128,128} spriteSourceSize - {160,128} + {128,128} textureRect - {{1135,376},{160,128}} + {{1691,261},{128,128}} textureRotated @@ -705,7 +705,7 @@ spriteSourceSize {128,128} textureRect - {{1297,391},{128,128}} + {{1821,261},{128,128}} textureRotated @@ -720,7 +720,7 @@ spriteSourceSize {128,128} textureRect - {{1427,391},{128,128}} + {{1,391},{128,128}} textureRotated @@ -735,7 +735,7 @@ spriteSourceSize {128,128} textureRect - {{1557,391},{128,128}} + {{131,391},{128,128}} textureRotated @@ -750,7 +750,7 @@ spriteSourceSize {128,128} textureRect - {{1687,391},{128,128}} + {{261,391},{128,128}} textureRotated @@ -765,7 +765,7 @@ spriteSourceSize {128,128} textureRect - {{1817,391},{128,128}} + {{391,391},{128,128}} textureRotated @@ -780,7 +780,7 @@ spriteSourceSize {128,128} textureRect - {{1,506},{128,128}} + {{521,391},{128,128}} textureRotated @@ -795,7 +795,7 @@ spriteSourceSize {128,128} textureRect - {{131,506},{128,128}} + {{651,391},{128,128}} textureRotated @@ -810,7 +810,7 @@ spriteSourceSize {128,128} textureRect - {{261,506},{128,128}} + {{781,391},{128,128}} textureRotated @@ -825,7 +825,7 @@ spriteSourceSize {128,128} textureRect - {{391,506},{128,128}} + {{911,391},{128,128}} textureRotated @@ -840,7 +840,7 @@ spriteSourceSize {128,128} textureRect - {{521,506},{128,128}} + {{1041,391},{128,128}} textureRotated @@ -855,7 +855,7 @@ spriteSourceSize {128,128} textureRect - {{651,506},{128,128}} + {{1171,391},{128,128}} textureRotated @@ -870,7 +870,7 @@ spriteSourceSize {128,128} textureRect - {{781,506},{128,128}} + {{1301,391},{128,128}} textureRotated @@ -885,7 +885,7 @@ spriteSourceSize {128,128} textureRect - {{911,506},{128,128}} + {{1431,391},{128,128}} textureRotated @@ -900,7 +900,7 @@ spriteSourceSize {128,128} textureRect - {{1041,506},{128,128}} + {{1561,391},{128,128}} textureRotated @@ -915,7 +915,7 @@ spriteSourceSize {128,128} textureRect - {{1171,521},{128,128}} + {{1691,391},{128,128}} textureRotated @@ -930,7 +930,7 @@ spriteSourceSize {128,128} textureRect - {{1301,521},{128,128}} + {{1821,391},{128,128}} textureRotated @@ -945,7 +945,7 @@ spriteSourceSize {128,128} textureRect - {{1431,521},{128,128}} + {{1,521},{128,128}} textureRotated @@ -960,7 +960,7 @@ spriteSourceSize {128,128} textureRect - {{1561,521},{128,128}} + {{131,521},{128,128}} textureRotated @@ -975,7 +975,7 @@ spriteSourceSize {128,128} textureRect - {{1691,521},{128,128}} + {{261,521},{128,128}} textureRotated @@ -990,7 +990,7 @@ spriteSourceSize {128,128} textureRect - {{1821,521},{128,128}} + {{391,521},{128,128}} textureRotated @@ -1005,7 +1005,7 @@ spriteSourceSize {128,128} textureRect - {{1,636},{128,128}} + {{521,521},{128,128}} textureRotated @@ -1020,7 +1020,7 @@ spriteSourceSize {128,128} textureRect - {{131,636},{128,128}} + {{651,521},{128,128}} textureRotated @@ -1035,7 +1035,7 @@ spriteSourceSize {128,128} textureRect - {{261,636},{128,128}} + {{781,521},{128,128}} textureRotated @@ -1050,7 +1050,7 @@ spriteSourceSize {128,128} textureRect - {{391,636},{128,128}} + {{911,521},{128,128}} textureRotated @@ -1065,7 +1065,7 @@ spriteSourceSize {128,128} textureRect - {{391,636},{128,128}} + {{911,521},{128,128}} textureRotated @@ -1080,7 +1080,7 @@ spriteSourceSize {128,128} textureRect - {{521,636},{128,128}} + {{1041,521},{128,128}} textureRotated @@ -1095,7 +1095,7 @@ spriteSourceSize {128,128} textureRect - {{651,636},{128,128}} + {{1171,521},{128,128}} textureRotated @@ -1110,7 +1110,7 @@ spriteSourceSize {128,128} textureRect - {{781,636},{128,128}} + {{1301,521},{128,128}} textureRotated @@ -1125,7 +1125,7 @@ spriteSourceSize {128,128} textureRect - {{911,636},{128,128}} + {{1431,521},{128,128}} textureRotated @@ -1140,7 +1140,7 @@ spriteSourceSize {128,128} textureRect - {{1041,636},{128,128}} + {{1561,521},{128,128}} textureRotated @@ -1155,7 +1155,7 @@ spriteSourceSize {128,128} textureRect - {{1171,651},{128,128}} + {{1691,521},{128,128}} textureRotated @@ -1170,7 +1170,7 @@ spriteSourceSize {128,128} textureRect - {{1301,651},{128,128}} + {{1821,521},{128,128}} textureRotated @@ -1185,7 +1185,7 @@ spriteSourceSize {128,128} textureRect - {{1431,651},{128,128}} + {{1,651},{128,128}} textureRotated @@ -1200,7 +1200,7 @@ spriteSourceSize {128,128} textureRect - {{1561,651},{128,128}} + {{131,651},{128,128}} textureRotated @@ -1215,7 +1215,7 @@ spriteSourceSize {128,128} textureRect - {{781,766},{128,128}} + {{1301,651},{128,128}} textureRotated @@ -1230,7 +1230,7 @@ spriteSourceSize {128,128} textureRect - {{911,766},{128,128}} + {{1431,651},{128,128}} textureRotated @@ -1245,7 +1245,7 @@ spriteSourceSize {128,128} textureRect - {{1041,766},{128,128}} + {{1561,651},{128,128}} textureRotated @@ -1260,7 +1260,7 @@ spriteSourceSize {128,128} textureRect - {{1691,651},{128,128}} + {{261,651},{128,128}} textureRotated @@ -1275,7 +1275,7 @@ spriteSourceSize {128,128} textureRect - {{1821,651},{128,128}} + {{391,651},{128,128}} textureRotated @@ -1290,7 +1290,7 @@ spriteSourceSize {128,128} textureRect - {{1,766},{128,128}} + {{521,651},{128,128}} textureRotated @@ -1305,7 +1305,7 @@ spriteSourceSize {128,128} textureRect - {{131,766},{128,128}} + {{651,651},{128,128}} textureRotated @@ -1320,7 +1320,7 @@ spriteSourceSize {128,128} textureRect - {{261,766},{128,128}} + {{781,651},{128,128}} textureRotated @@ -1335,7 +1335,7 @@ spriteSourceSize {128,128} textureRect - {{391,766},{128,128}} + {{911,651},{128,128}} textureRotated @@ -1350,7 +1350,7 @@ spriteSourceSize {128,128} textureRect - {{521,766},{128,128}} + {{1041,651},{128,128}} textureRotated @@ -1365,7 +1365,7 @@ spriteSourceSize {128,128} textureRect - {{651,766},{128,128}} + {{1171,651},{128,128}} textureRotated @@ -1381,9 +1381,9 @@ realTextureFileName k5m5.png size - {1950,895} + {1950,780} smartupdate - $TexturePacker:SmartUpdate:32a2571cee9be8a3fd6763c90c8355ed:715b12f3f771495ae87cf87210213542:ba44c0b6cfda977280886ffe1cf4912b$ + $TexturePacker:SmartUpdate:1fd94e92b4f19a39b0d35685f964c2c6:9ec5b10919eed82087c2319f1a01bed9:ba44c0b6cfda977280886ffe1cf4912b$ textureFileName k5m5.png diff --git a/assets/resources/game/heros/hero/k5m5.plist.meta b/assets/resources/game/heros/hero/k5m5.plist.meta index f02bac82..13b3ad7b 100644 --- a/assets/resources/game/heros/hero/k5m5.plist.meta +++ b/assets/resources/game/heros/hero/k5m5.plist.meta @@ -18,8 +18,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1171, - "trimY": 651, + "trimX": 1691, + "trimY": 521, "width": 128, "height": 128, "rawWidth": 128, @@ -64,7 +64,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1431, + "trimX": 1, "trimY": 651, "width": 128, "height": 128, @@ -110,8 +110,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 391, - "trimY": 506, + "trimX": 911, + "trimY": 391, "width": 128, "height": 128, "rawWidth": 128, @@ -156,8 +156,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 651, - "trimY": 766, + "trimX": 1171, + "trimY": 651, "width": 128, "height": 128, "rawWidth": 128, @@ -202,11 +202,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1459, - "trimY": 131, - "width": 160, + "trimX": 1691, + "trimY": 1, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -248,8 +248,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1041, - "trimY": 766, + "trimX": 1561, + "trimY": 651, "width": 128, "height": 128, "rawWidth": 128, @@ -294,11 +294,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 973, - "trimY": 376, - "width": 160, + "trimX": 1561, + "trimY": 261, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -340,8 +340,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 636, + "trimX": 521, + "trimY": 521, "width": 128, "height": 128, "rawWidth": 128, @@ -386,11 +386,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 163, - "trimY": 376, - "width": 160, + "trimX": 911, + "trimY": 261, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -432,11 +432,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1297, + "trimX": 1, "trimY": 1, - "width": 160, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -478,11 +478,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1459, + "trimX": 131, "trimY": 1, - "width": 160, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -524,11 +524,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1621, + "trimX": 261, "trimY": 1, - "width": 160, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -570,11 +570,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1783, + "trimX": 391, "trimY": 1, - "width": 160, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -616,11 +616,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 116, - "width": 160, + "trimX": 521, + "trimY": 1, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -662,11 +662,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 163, - "trimY": 116, - "width": 160, + "trimX": 651, + "trimY": 1, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -708,11 +708,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 325, - "trimY": 116, - "width": 160, + "trimX": 781, + "trimY": 1, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -754,11 +754,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 487, - "trimY": 116, - "width": 160, + "trimX": 911, + "trimY": 1, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -800,11 +800,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 649, - "trimY": 116, - "width": 160, + "trimX": 1041, + "trimY": 1, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -846,11 +846,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 811, - "trimY": 116, - "width": 160, + "trimX": 1171, + "trimY": 1, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -892,11 +892,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 325, - "trimY": 246, - "width": 160, + "trimX": 391, + "trimY": 131, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -938,11 +938,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 487, - "trimY": 246, - "width": 160, + "trimX": 521, + "trimY": 131, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -984,11 +984,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 649, - "trimY": 246, - "width": 160, + "trimX": 651, + "trimY": 131, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -1030,11 +1030,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 811, - "trimY": 246, - "width": 160, + "trimX": 781, + "trimY": 131, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -1076,11 +1076,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 973, - "trimY": 116, - "width": 160, + "trimX": 1301, + "trimY": 1, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -1122,11 +1122,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1135, - "trimY": 116, - "width": 160, + "trimX": 1431, + "trimY": 1, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -1168,11 +1168,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1297, - "trimY": 131, - "width": 160, + "trimX": 1561, + "trimY": 1, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -1214,11 +1214,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1621, - "trimY": 131, - "width": 160, + "trimX": 1821, + "trimY": 1, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -1260,11 +1260,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1783, + "trimX": 1, "trimY": 131, - "width": 160, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -1306,11 +1306,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 246, - "width": 160, + "trimX": 131, + "trimY": 131, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -1352,11 +1352,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 163, - "trimY": 246, - "width": 160, + "trimX": 261, + "trimY": 131, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -1398,12 +1398,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 1, - "width": 160, - "height": 113, - "rawWidth": 160, - "rawHeight": 113, + "trimX": 911, + "trimY": 131, + "width": 128, + "height": 128, + "rawWidth": 128, + "rawHeight": 128, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1444,12 +1444,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 1, - "width": 160, - "height": 113, - "rawWidth": 160, - "rawHeight": 113, + "trimX": 911, + "trimY": 131, + "width": 128, + "height": 128, + "rawWidth": 128, + "rawHeight": 128, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1490,12 +1490,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 163, - "trimY": 1, - "width": 160, - "height": 113, - "rawWidth": 160, - "rawHeight": 113, + "trimX": 1041, + "trimY": 131, + "width": 128, + "height": 128, + "rawWidth": 128, + "rawHeight": 128, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1536,12 +1536,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 325, - "trimY": 1, - "width": 160, - "height": 113, - "rawWidth": 160, - "rawHeight": 113, + "trimX": 1171, + "trimY": 131, + "width": 128, + "height": 128, + "rawWidth": 128, + "rawHeight": 128, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1582,12 +1582,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 487, - "trimY": 1, - "width": 160, - "height": 113, - "rawWidth": 160, - "rawHeight": 113, + "trimX": 1301, + "trimY": 131, + "width": 128, + "height": 128, + "rawWidth": 128, + "rawHeight": 128, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1628,12 +1628,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 649, - "trimY": 1, - "width": 160, - "height": 113, - "rawWidth": 160, - "rawHeight": 113, + "trimX": 1431, + "trimY": 131, + "width": 128, + "height": 128, + "rawWidth": 128, + "rawHeight": 128, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1674,12 +1674,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 811, - "trimY": 1, - "width": 160, - "height": 113, - "rawWidth": 160, - "rawHeight": 113, + "trimX": 1561, + "trimY": 131, + "width": 128, + "height": 128, + "rawWidth": 128, + "rawHeight": 128, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1720,12 +1720,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 973, - "trimY": 1, - "width": 160, - "height": 113, - "rawWidth": 160, - "rawHeight": 113, + "trimX": 1691, + "trimY": 131, + "width": 128, + "height": 128, + "rawWidth": 128, + "rawHeight": 128, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1766,12 +1766,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1135, - "trimY": 1, - "width": 160, - "height": 113, - "rawWidth": 160, - "rawHeight": 113, + "trimX": 1821, + "trimY": 131, + "width": 128, + "height": 128, + "rawWidth": 128, + "rawHeight": 128, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1812,11 +1812,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 973, - "trimY": 246, - "width": 160, + "trimX": 1, + "trimY": 261, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -1858,11 +1858,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1135, - "trimY": 246, - "width": 160, + "trimX": 131, + "trimY": 261, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -1904,11 +1904,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1297, + "trimX": 261, "trimY": 261, - "width": 160, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -1950,11 +1950,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1459, + "trimX": 391, "trimY": 261, - "width": 160, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -1996,11 +1996,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1621, + "trimX": 521, "trimY": 261, - "width": 160, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -2042,11 +2042,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1783, + "trimX": 651, "trimY": 261, - "width": 160, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -2088,11 +2088,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1297, + "trimX": 1, "trimY": 1, - "width": 160, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -2134,11 +2134,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 376, - "width": 160, + "trimX": 781, + "trimY": 261, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -2180,11 +2180,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 325, - "trimY": 376, - "width": 160, + "trimX": 1041, + "trimY": 261, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -2226,11 +2226,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 487, - "trimY": 376, - "width": 160, + "trimX": 1171, + "trimY": 261, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -2272,11 +2272,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 649, - "trimY": 376, - "width": 160, + "trimX": 1301, + "trimY": 261, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -2318,11 +2318,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 811, - "trimY": 376, - "width": 160, + "trimX": 1431, + "trimY": 261, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -2364,11 +2364,11 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1135, - "trimY": 376, - "width": 160, + "trimX": 1691, + "trimY": 261, + "width": 128, "height": 128, - "rawWidth": 160, + "rawWidth": 128, "rawHeight": 128, "borderTop": 0, "borderBottom": 0, @@ -2410,8 +2410,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1297, - "trimY": 391, + "trimX": 1821, + "trimY": 261, "width": 128, "height": 128, "rawWidth": 128, @@ -2456,7 +2456,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1427, + "trimX": 1, "trimY": 391, "width": 128, "height": 128, @@ -2502,7 +2502,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1557, + "trimX": 131, "trimY": 391, "width": 128, "height": 128, @@ -2548,7 +2548,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1687, + "trimX": 261, "trimY": 391, "width": 128, "height": 128, @@ -2594,7 +2594,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1817, + "trimX": 391, "trimY": 391, "width": 128, "height": 128, @@ -2640,8 +2640,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 506, + "trimX": 521, + "trimY": 391, "width": 128, "height": 128, "rawWidth": 128, @@ -2686,8 +2686,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 131, - "trimY": 506, + "trimX": 651, + "trimY": 391, "width": 128, "height": 128, "rawWidth": 128, @@ -2732,8 +2732,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 261, - "trimY": 506, + "trimX": 781, + "trimY": 391, "width": 128, "height": 128, "rawWidth": 128, @@ -2778,8 +2778,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 521, - "trimY": 506, + "trimX": 1041, + "trimY": 391, "width": 128, "height": 128, "rawWidth": 128, @@ -2824,8 +2824,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 651, - "trimY": 506, + "trimX": 1171, + "trimY": 391, "width": 128, "height": 128, "rawWidth": 128, @@ -2870,8 +2870,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 781, - "trimY": 506, + "trimX": 1301, + "trimY": 391, "width": 128, "height": 128, "rawWidth": 128, @@ -2916,8 +2916,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 911, - "trimY": 506, + "trimX": 1431, + "trimY": 391, "width": 128, "height": 128, "rawWidth": 128, @@ -2962,8 +2962,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1041, - "trimY": 506, + "trimX": 1561, + "trimY": 391, "width": 128, "height": 128, "rawWidth": 128, @@ -3008,8 +3008,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1171, - "trimY": 521, + "trimX": 1691, + "trimY": 391, "width": 128, "height": 128, "rawWidth": 128, @@ -3054,8 +3054,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1301, - "trimY": 521, + "trimX": 1821, + "trimY": 391, "width": 128, "height": 128, "rawWidth": 128, @@ -3100,7 +3100,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1431, + "trimX": 1, "trimY": 521, "width": 128, "height": 128, @@ -3146,7 +3146,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1561, + "trimX": 131, "trimY": 521, "width": 128, "height": 128, @@ -3192,7 +3192,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1691, + "trimX": 261, "trimY": 521, "width": 128, "height": 128, @@ -3238,7 +3238,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1821, + "trimX": 391, "trimY": 521, "width": 128, "height": 128, @@ -3284,8 +3284,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 131, - "trimY": 636, + "trimX": 651, + "trimY": 521, "width": 128, "height": 128, "rawWidth": 128, @@ -3330,8 +3330,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 261, - "trimY": 636, + "trimX": 781, + "trimY": 521, "width": 128, "height": 128, "rawWidth": 128, @@ -3376,8 +3376,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 391, - "trimY": 636, + "trimX": 911, + "trimY": 521, "width": 128, "height": 128, "rawWidth": 128, @@ -3422,8 +3422,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 391, - "trimY": 636, + "trimX": 911, + "trimY": 521, "width": 128, "height": 128, "rawWidth": 128, @@ -3468,8 +3468,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 521, - "trimY": 636, + "trimX": 1041, + "trimY": 521, "width": 128, "height": 128, "rawWidth": 128, @@ -3514,8 +3514,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 651, - "trimY": 636, + "trimX": 1171, + "trimY": 521, "width": 128, "height": 128, "rawWidth": 128, @@ -3560,8 +3560,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 781, - "trimY": 636, + "trimX": 1301, + "trimY": 521, "width": 128, "height": 128, "rawWidth": 128, @@ -3606,8 +3606,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 911, - "trimY": 636, + "trimX": 1431, + "trimY": 521, "width": 128, "height": 128, "rawWidth": 128, @@ -3652,8 +3652,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1041, - "trimY": 636, + "trimX": 1561, + "trimY": 521, "width": 128, "height": 128, "rawWidth": 128, @@ -3698,8 +3698,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1301, - "trimY": 651, + "trimX": 1821, + "trimY": 521, "width": 128, "height": 128, "rawWidth": 128, @@ -3744,7 +3744,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1561, + "trimX": 131, "trimY": 651, "width": 128, "height": 128, @@ -3790,8 +3790,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 781, - "trimY": 766, + "trimX": 1301, + "trimY": 651, "width": 128, "height": 128, "rawWidth": 128, @@ -3836,8 +3836,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 911, - "trimY": 766, + "trimX": 1431, + "trimY": 651, "width": 128, "height": 128, "rawWidth": 128, @@ -3882,7 +3882,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1691, + "trimX": 261, "trimY": 651, "width": 128, "height": 128, @@ -3928,7 +3928,7 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1821, + "trimX": 391, "trimY": 651, "width": 128, "height": 128, @@ -3974,8 +3974,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 766, + "trimX": 521, + "trimY": 651, "width": 128, "height": 128, "rawWidth": 128, @@ -4020,8 +4020,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 131, - "trimY": 766, + "trimX": 651, + "trimY": 651, "width": 128, "height": 128, "rawWidth": 128, @@ -4066,8 +4066,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 261, - "trimY": 766, + "trimX": 781, + "trimY": 651, "width": 128, "height": 128, "rawWidth": 128, @@ -4112,8 +4112,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 391, - "trimY": 766, + "trimX": 911, + "trimY": 651, "width": 128, "height": 128, "rawWidth": 128, @@ -4158,8 +4158,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 521, - "trimY": 766, + "trimX": 1041, + "trimY": 651, "width": 128, "height": 128, "rawWidth": 128, diff --git a/assets/resources/game/heros/hero/k5m5.png b/assets/resources/game/heros/hero/k5m5.png index 7d334450..4d90a5d6 100644 Binary files a/assets/resources/game/heros/hero/k5m5.png and b/assets/resources/game/heros/hero/k5m5.png differ diff --git a/assets/resources/game/heros/hk5.prefab b/assets/resources/game/heros/hk5.prefab index 9a45ba7e..b1917e63 100644 --- a/assets/resources/game/heros/hk5.prefab +++ b/assets/resources/game/heros/hk5.prefab @@ -154,8 +154,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 160, - "height": 113 + "width": 128, + "height": 128 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/resources/game/heros/me1.prefab b/assets/resources/game/heros/me1.prefab deleted file mode 100644 index 177d1bd3..00000000 --- a/assets/resources/game/heros/me1.prefab +++ /dev/null @@ -1,787 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "me1", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "me1", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - }, - { - "__id__": 14 - }, - { - "__id__": 26 - } - ], - "_active": true, - "_components": [ - { - "__id__": 37 - }, - { - "__id__": 39 - }, - { - "__id__": 41 - }, - { - "__id__": 43 - }, - { - "__id__": 45 - } - ], - "_prefab": { - "__id__": 47 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -0.041, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "anm", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - }, - { - "__id__": 7 - }, - { - "__id__": 9 - }, - { - "__id__": 11 - } - ], - "_prefab": { - "__id__": 13 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -25, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": -1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 4 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 128, - "height": 128 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "9eaEPPEkdKYYfWIxgJ1KbU" - }, - { - "__type__": "4ba4awuz8tF34rq4TkZ9W1S", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "569pdLaDNB6qtHi4mnEa2p" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 8 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "291f9343-4e76-46fa-9b8b-a44fffdc4d71@7563c", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "291f9343-4e76-46fa-9b8b-a44fffdc4d71", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "aapdDlt5hKmZ6bjST88uia" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 10 - }, - "playOnLoad": true, - "_clips": [ - { - "__uuid__": "4d8d5ab2-98a3-4ffa-85e5-c998de054a3d", - "__expectedType__": "cc.AnimationClip" - }, - { - "__uuid__": "febe9e99-93cc-4cec-a8e5-acaa7bb3b4c7", - "__expectedType__": "cc.AnimationClip" - }, - { - "__uuid__": "67506597-7303-4eaf-9406-9f273aefecb0", - "__expectedType__": "cc.AnimationClip" - }, - { - "__uuid__": "f09d798c-b375-48e8-9b7e-a5b559b125c8", - "__expectedType__": "cc.AnimationClip" - }, - { - "__uuid__": "65059101-3778-40b3-9a6b-f38c9de7dcc6", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "406uXfKLJEbab+NVEqD1aS" - }, - { - "__type__": "954e43Y+QJHNIUpmqTCWA7A", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 12 - }, - "hitFlashMaterial": { - "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", - "__expectedType__": "cc.Material" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b4+2TVK9JC7p5lhflMVjuO" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "4aKyovCOhDJpr23Of35+5a", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 15 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 14 - }, - "asset": { - "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b", - "__expectedType__": "cc.Prefab" - }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": { - "__id__": 16 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "3a1pwLAh1NkYnlDVrAFcnS", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 17 - }, - { - "__id__": 19 - }, - { - "__id__": 20 - }, - { - "__id__": 21 - }, - { - "__id__": 22 - }, - { - "__id__": 23 - }, - { - "__id__": 25 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 18 - }, - "propertyPath": [ - "_name" - ], - "value": "shielded" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c46/YsCPVOJYA4mWEpNYRx" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 18 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 18 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 18 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 18 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 24 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 120, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "63NP9yq3hEUKD/OZZZ5t7x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 18 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_prefab": { - "__id__": 27 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 26 - }, - "asset": { - "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c", - "__expectedType__": "cc.Prefab" - }, - "fileId": "5fqU0L3/FOhKaco5UkHuWT", - "instance": { - "__id__": 28 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "69IAw7dThHvIlVtTfXOVMZ", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [], - "propertyOverrides": [ - { - "__id__": 29 - }, - { - "__id__": 31 - }, - { - "__id__": 32 - }, - { - "__id__": 33 - }, - { - "__id__": 34 - }, - { - "__id__": 36 - } - ], - "removedComponents": [] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 30 - }, - "propertyPath": [ - "_name" - ], - "value": "top" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "5fqU0L3/FOhKaco5UkHuWT" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 30 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 110.506, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 30 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 30 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 35 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 10.531, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "16MuhUBUpB2ZdBTYflEf1n" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 30 - }, - "propertyPath": [ - "_lscale" - ], - "value": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - } - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 38 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 80, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "14OhXRCixNOaApgow/hFbp" - }, - { - "__type__": "a0379fmhvBHcbNcBF/l43O8", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 40 - }, - "anm": { - "__id__": 5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "73PcRpG0xKxJpIRC2zbI/o" - }, - { - "__type__": "873f8d+SolMEo8DiTTxZRh4", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 42 - }, - "debugMode": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ae2ywFEqlJ26Sq7z7AtGgk" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 44 - }, - "enabledContactListener": true, - "bullet": false, - "awakeOnLoad": true, - "_group": 4, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a5vv6W0YtAmJB1hZwCBALm" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 46 - }, - "tag": 0, - "_group": 4, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 50 - }, - "_size": { - "__type__": "cc.Size", - "width": 30, - "height": 100 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23j+p5lLdC+r4iKSVeLNM4" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "fdklpBwCBM/qJ4WFlQF3kT", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": [ - { - "__id__": 26 - }, - { - "__id__": 14 - } - ] - } -] \ No newline at end of file diff --git a/assets/resources/game/heros/me1.prefab.meta b/assets/resources/game/heros/me1.prefab.meta deleted file mode 100644 index 356c5064..00000000 --- a/assets/resources/game/heros/me1.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "b247a03b-efeb-46b7-9e39-28f01ff38c6a", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "me1" - } -} diff --git a/assets/resources/game/heros/mud5.prefab b/assets/resources/game/heros/mud5.prefab index e6ba0fdb..0ca86ed5 100644 --- a/assets/resources/game/heros/mud5.prefab +++ b/assets/resources/game/heros/mud5.prefab @@ -295,6 +295,10 @@ "__uuid__": "8eee8ab1-fe48-4b22-b956-3f5c18fc4810", "__expectedType__": "cc.Material" }, + "outlineMatGreen": null, + "outlineMatBlue": null, + "outlineMatPurple": null, + "outlineMatYellow": null, "_id": "" }, { diff --git a/assets/resources/gui/element/heros.prefab b/assets/resources/gui/element/heros.prefab index 952d6232..4c754a80 100644 --- a/assets/resources/gui/element/heros.prefab +++ b/assets/resources/gui/element/heros.prefab @@ -2603,13 +2603,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@85704", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -2619,10 +2616,7 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269", - "__expectedType__": "cc.SpriteAtlas" - }, + "_atlas": null, "_id": "" }, { @@ -2643,15 +2637,9 @@ }, "playOnLoad": true, "_clips": [ - { - "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", - "__expectedType__": "cc.AnimationClip" - } + null ], - "_defaultClip": { - "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", - "__expectedType__": "cc.AnimationClip" - }, + "_defaultClip": null, "_id": "" }, { @@ -2813,13 +2801,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@85704", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -2829,10 +2814,7 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269", - "__expectedType__": "cc.SpriteAtlas" - }, + "_atlas": null, "_id": "" }, { @@ -2853,15 +2835,9 @@ }, "playOnLoad": true, "_clips": [ - { - "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", - "__expectedType__": "cc.AnimationClip" - } + null ], - "_defaultClip": { - "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", - "__expectedType__": "cc.AnimationClip" - }, + "_defaultClip": null, "_id": "" }, { @@ -3023,13 +2999,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@85704", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -3039,10 +3012,7 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269", - "__expectedType__": "cc.SpriteAtlas" - }, + "_atlas": null, "_id": "" }, { @@ -3063,15 +3033,9 @@ }, "playOnLoad": true, "_clips": [ - { - "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", - "__expectedType__": "cc.AnimationClip" - } + null ], - "_defaultClip": { - "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", - "__expectedType__": "cc.AnimationClip" - }, + "_defaultClip": null, "_id": "" }, { @@ -3233,13 +3197,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@85704", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -3249,10 +3210,7 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269", - "__expectedType__": "cc.SpriteAtlas" - }, + "_atlas": null, "_id": "" }, { @@ -3273,15 +3231,9 @@ }, "playOnLoad": true, "_clips": [ - { - "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", - "__expectedType__": "cc.AnimationClip" - } + null ], - "_defaultClip": { - "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", - "__expectedType__": "cc.AnimationClip" - }, + "_defaultClip": null, "_id": "" }, { @@ -3443,13 +3395,10 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269@85704", - "__expectedType__": "cc.SpriteFrame" - }, + "_spriteFrame": null, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -3459,10 +3408,7 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": { - "__uuid__": "97aa0f88-8138-4b35-94bc-4f691e3f6269", - "__expectedType__": "cc.SpriteAtlas" - }, + "_atlas": null, "_id": "" }, { @@ -3483,15 +3429,9 @@ }, "playOnLoad": true, "_clips": [ - { - "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", - "__expectedType__": "cc.AnimationClip" - } + null ], - "_defaultClip": { - "__uuid__": "e181a0cd-8e6c-4efd-9813-66a1d3ed1e9a", - "__expectedType__": "cc.AnimationClip" - }, + "_defaultClip": null, "_id": "" }, { diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index 23347530..0e08bdff 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -83,24 +83,27 @@ export const CARD_HERO_MAX_LEVEL = 1 export const CardPoolList: CardConfig[] = [ { uuid: 5001, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, - { uuid: 5101, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, - { uuid: 5201, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, - { uuid: 5301, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, - + { uuid: 5002, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, { uuid: 5003, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, + { uuid: 5004, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, + { uuid: 5005, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, + + { uuid: 5101, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, { uuid: 5102, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, + { uuid: 5103, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, + { uuid: 5104, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, + { uuid: 5105, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, + + { uuid: 5201, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, + { uuid: 5202, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, + { uuid: 5203, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, + { uuid: 5204, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, + + { uuid: 5301, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, { uuid: 5302, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, - { uuid: 5002, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 }, - { uuid: 5103, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 }, - { uuid: 5202, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 }, - - { uuid: 5004, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 }, - { uuid: 5104, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 }, - { uuid: 5303, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 }, - - { uuid: 5105, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 3, kind: CKind.Hero, hero_lv: 1 }, - { uuid: 5304, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 3, kind: CKind.Hero, hero_lv: 1 }, + { uuid: 5401, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, + { uuid: 5402, type: CardType.Hero, cost: 10, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 }, // 技能卡牌 (以增益/辅助为主，因为在备战期没有敌人) { uuid: 6401, type: CardType.Skill, cost: 10, weight: 20, pool_lv: 1, kind: CKind.Skill, card_lv: 1, name: t("skill_name_6401"), info: t("skill_info_6401"), is_inst: true, t_times: 1, t_inv: 0 }, diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index f6bcf446..ee7fa28d 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -126,15 +126,15 @@ export interface HSkillInfo { export const HeroInfo: Record = { // ========== 近战英雄 ========== - 5001:{uuid:5001,name:"盾战士",path:"hk1", fac:FacSet.HERO,cards_lv:1,lv:1,type:HType.Melee,hp:150,ap:25,speed:800,atking:[{s_uuid:6301,t_num:2}], + 5001:{uuid:5001,name:"见习战士",path:"hk2", fac:FacSet.HERO,cards_lv:1,lv:1,type:HType.Melee,hp:150,ap:25,speed:800,atking:[{s_uuid:6301,t_num:2}], skills:{6001:{uuid:6001,lv:1,cd:1.5,ccd:0}},info:"近战,魔法盾 坦克"}, - 5002:{uuid:5002,name:"圣骑士",path:"hk3", fac:FacSet.HERO,cards_lv:3,lv:1,type:HType.Melee,hp:150,ap:75,speed:800,atked:[{s_uuid:6301,t_num:2}], + 5002:{uuid:5002,name:"盾骑士",path:"hk1", fac:FacSet.HERO,cards_lv:3,lv:1,type:HType.Melee,hp:150,ap:75,speed:800,atked:[{s_uuid:6301,t_num:2}], skills:{6001:{uuid:6001,lv:1,cd:1.5,ccd:0}},info:"近战,群体护盾 坦克"}, - 5003:{uuid:5003,name:"风行剑士",path:"hk4", fac:FacSet.HERO,cards_lv:2,lv:1,type:HType.Melee,hp:100,ap:100,speed:800, + 5003:{uuid:5003,name:"战士3",path:"hk3", fac:FacSet.HERO,cards_lv:2,lv:1,type:HType.Melee,hp:100,ap:100,speed:800, skills:{6001:{uuid:6001,lv:1,cd:1.5,ccd:0}},info:"近战,闪击 近战dps"}, - 5004:{uuid:5004,name:"刺客",path:"hc1", fac:FacSet.HERO,cards_lv:4,lv:1,type:HType.Melee,hp:100,ap:200,speed:800, + 5004:{uuid:5004,name:"战士4",path:"hk4", fac:FacSet.HERO,cards_lv:4,lv:1,type:HType.Melee,hp:100,ap:200,speed:800, skills:{6001:{uuid:6001,lv:1,cd:0.7,ccd:0}},info:"近战,火焰击 近战dps"}, - 5005:{uuid:5005,name:"自然骑士",path:"hk2", fac:FacSet.HERO,cards_lv:4,lv:1,type:HType.Melee,hp:100,ap:200,speed:800, + 5005:{uuid:5005,name:"战士5",path:"hk5", fac:FacSet.HERO,cards_lv:4,lv:1,type:HType.Melee,hp:100,ap:200,speed:800, skills:{6001:{uuid:6001,lv:1,cd:1.5,ccd:0}},info:"治疗近战,火焰击 近战dps"}, @@ -143,32 +143,34 @@ export const HeroInfo: Record = { skills:{6201:{uuid:6007,lv:1,cd:1,ccd:0}},info:"冰球,冰锥 远法dps"}, 5102:{uuid:5102,name:"火焰法师",path:"hm1", fac:FacSet.HERO,cards_lv:2,lv:1,type:HType.Long,hp:130,ap:120,speed:800, skills:{6203:{uuid:6002,lv:1,cd:1,ccd:0}},info:"火击,火球 远法dps"}, - 5103:{uuid:5103,name:"冰法法师",path:"hm9", fac:FacSet.HERO,cards_lv:3,lv:1,type:HType.Long,hp:145,ap:180,speed:800, + 5103:{uuid:5103,name:"冰法法师",path:"hm3", fac:FacSet.HERO,cards_lv:3,lv:1,type:HType.Long,hp:145,ap:180,speed:800, skills:{6201:{uuid:6002,lv:1,cd:1,ccd:0}},info:"冰击,冰锥 远法dps"}, - 5104:{uuid:5104,name:"寒霜术士",path:"hm4", fac:FacSet.HERO,cards_lv:4,lv:1,type:HType.Long,hp:160,ap:240,speed:800, + 5104:{uuid:5104,name:"寒霜术士",path:"hm5", fac:FacSet.HERO,cards_lv:4,lv:1,type:HType.Long,hp:160,ap:240,speed:800, skills:{6201:{uuid:66002201,lv:1,cd:1,ccd:0}},info:"冰锥,冰刺 远法dps"}, - 5105:{uuid:5105,name:"炎爆法师",path:"hm3", fac:FacSet.HERO,cards_lv:5,lv:1,type:HType.Long,hp:175,ap:300,speed:800, + 5105:{uuid:5105,name:"炎爆法师",path:"hm4", fac:FacSet.HERO,cards_lv:5,lv:1,type:HType.Long,hp:175,ap:300,speed:800, skills:{6203:{uuid:6002,lv:1,cd:1,ccd:0}},info:"火球,陨石术 远法dps" }, // ========== 远程英雄 ========== 5201:{uuid:5201,name:"射手",path:"ha1", fac:FacSet.HERO,cards_lv:1,lv:1,type:HType.Long,hp:115,ap:60,speed:800, skills:{6101:{uuid:6005,lv:1,cd:0.9,ccd:0}},info:"普通射击,暴射 远dps"}, - 5202:{uuid:5202,name:"游侠",path:"ha2", fac:FacSet.HERO,cards_lv:3,lv:1,type:HType.Long,hp:145,ap:180,speed:800, + 5202:{uuid:5202,name:"游侠2",path:"ha2", fac:FacSet.HERO,cards_lv:3,lv:1,type:HType.Long,hp:145,ap:180,speed:800, skills:{6011:{uuid:6005,lv:1,cd:0.9,ccd:0}},info:"暴射,光箭 远dps"}, - 5203:{uuid:5203,name:"游侠",path:"ha3", fac:FacSet.HERO,cards_lv:3,lv:1,type:HType.Long,hp:145,ap:180,speed:800, + 5203:{uuid:5203,name:"游侠3",path:"ha3", fac:FacSet.HERO,cards_lv:3,lv:1,type:HType.Long,hp:145,ap:180,speed:800, skills:{6011:{uuid:6005,lv:1,cd:0.9,ccd:0}},info:"暴射,光箭 远dps"}, + 5204:{uuid:5204,name:"游侠4",path:"ha4", fac:FacSet.HERO,cards_lv:3,lv:1,type:HType.Long,hp:145,ap:180,speed:800, + skills:{6011:{uuid:6005,lv:1,cd:0.9,ccd:0}},info:"暴射,光箭 远dps"}, // ========== 辅助英雄 ========== 5301:{uuid:5301,name:"牧师",path:"hh1", fac:FacSet.HERO,cards_lv:1,lv:1,type:HType.Long,hp:115,ap:50,speed:800,atking:[{s_uuid:6302,t_num:2}], skills:{6202:{uuid:6004,lv:1,cd:1.2,ccd:0}},info:"冰锥1,治疗 远辅助" }, - 5302:{uuid:5302,name:"战地医师",path:"hz1", fac:FacSet.HERO,cards_lv:2,lv:1,type:HType.Long,hp:130,ap:50,speed:800,atking:[{s_uuid:6304,t_num:2}], + 5302:{uuid:5302,name:"医师",path:"hh2", fac:FacSet.HERO,cards_lv:2,lv:1,type:HType.Long,hp:130,ap:50,speed:800,atking:[{s_uuid:6304,t_num:2}], + skills:{6202:{uuid:6004,lv:1,cd:1.2,ccd:0}},info:"冰锥1,群体治疗 远辅助"}, + + // ========== 辅助英雄 ========== + 5401:{uuid:5401,name:"刺客1",path:"hc1", fac:FacSet.HERO,cards_lv:1,lv:1,type:HType.Long,hp:115,ap:50,speed:800,atking:[{s_uuid:6302,t_num:2}], + skills:{6202:{uuid:6004,lv:1,cd:1.2,ccd:0}},info:"冰锥1,治疗 远辅助" }, + 5402:{uuid:5402,name:"刺客2",path:"hc2", fac:FacSet.HERO,cards_lv:2,lv:1,type:HType.Long,hp:130,ap:50,speed:800,atking:[{s_uuid:6304,t_num:2}], skills:{6202:{uuid:6004,lv:1,cd:1.2,ccd:0}},info:"冰锥1,群体治疗 远辅助"}, - - 5303:{uuid:5303,name:"守护祭司",path:"hm6", fac:FacSet.HERO,cards_lv:4,lv:1,type:HType.Long,hp:160,ap:80,speed:800, - skills:{6202:{uuid:6004,lv:1,cd:1.2,ccd:0}},info:"普通射击,单体攻击buff 射手辅助"}, - 5304:{uuid:5304,name:"秘法精灵",path:"hm7", fac:FacSet.HERO,cards_lv:6,lv:1,type:HType.Long,hp:190,ap:120,speed:800, - skills:{6202:{uuid:6004,lv:1,cd:1.2,ccd:0}},info:"普通射击,群体攻击buff 射手辅助"}, - @@ -229,8 +231,9 @@ export const HeroInfo: Record = { export const HeroList: number[] = [ 5001, 5002, 5003, 5004, 5005, 5101, 5102, 5103, 5104, 5105, - 5201, 5202, 5203, - 5301, 5302, 5303, 5304 + 5201, 5202,5203,5204, + 5301, 5302, + 5401, 5402, ];