diff --git a/assets/resources/game/heros/skill.plist b/assets/resources/game/heros/skill.plist index 2626d214..75e51ed8 100644 --- a/assets/resources/game/heros/skill.plist +++ b/assets/resources/game/heros/skill.plist @@ -11,13 +11,13 @@ spriteOffset {0,0} spriteSize - {102,106} + {72,75} spriteSourceSize - {102,106} + {72,75} textureRect - {{571,153},{102,106}} + {{78,1},{72,75}} textureRotated - + 1002.png @@ -26,13 +26,13 @@ spriteOffset {0,0} spriteSize - {102,106} + {72,75} spriteSourceSize - {102,106} + {72,75} textureRect - {{679,155},{102,106}} + {{152,1},{72,75}} textureRotated - + 1011.png @@ -41,13 +41,13 @@ spriteOffset {0,0} spriteSize - {102,106} + {72,75} spriteSourceSize - {102,106} + {72,75} textureRect - {{787,157},{102,106}} + {{226,1},{72,75}} textureRotated - + 1012.png @@ -56,26 +56,26 @@ spriteOffset {0,0} spriteSize - {102,106} + {72,75} spriteSourceSize - {102,106} + {72,75} textureRect - {{895,157},{102,106}} + {{300,1},{72,75}} textureRotated - + 6001.png aliases spriteOffset - {0,0} + {-1,-1} spriteSize - {64,64} + {71,73} spriteSourceSize - {64,64} + {75,75} textureRect - {{438,1},{64,64}} + {{374,1},{71,73}} textureRotated @@ -86,11 +86,11 @@ spriteOffset {0,0} spriteSize - {64,64} + {75,75} spriteSourceSize - {64,64} + {75,75} textureRect - {{504,1},{64,64}} + {{1,1},{75,75}} textureRotated @@ -99,13 +99,13 @@ aliases spriteOffset - {0,0} + {-1,-1} spriteSize - {60,60} + {71,73} spriteSourceSize - {60,60} + {75,75} textureRect - {{179,1},{60,60}} + {{447,1},{71,73}} textureRotated @@ -114,58 +114,58 @@ aliases spriteOffset - {0,0} + {0,-1} spriteSize - {64,64} + {39,65} spriteSourceSize - {64,64} + {75,75} textureRect - {{570,1},{64,64}} + {{149,78},{39,65}} textureRotated - + 6005.png aliases spriteOffset - {0,0} + {0,-2} spriteSize - {64,64} + {51,67} spriteSourceSize - {64,64} + {75,75} textureRect - {{636,1},{64,64}} + {{447,76},{51,67}} textureRotated - + 6006.png aliases spriteOffset - {0,0} + {0,-2} spriteSize - {64,64} + {51,71} spriteSourceSize - {64,64} + {75,75} textureRect - {{702,1},{64,64}} + {{374,76},{51,71}} textureRotated - + 6101.png aliases spriteOffset - {0,-4} + {0,-2} spriteSize - {38,114} + {25,69} spriteSourceSize - {128,128} + {75,75} textureRect - {{1,1},{38,114}} + {{216,78},{25,69}} textureRotated @@ -174,13 +174,13 @@ aliases spriteOffset - {0,-2} + {0,-1} spriteSize - {74,124} + {45,73} spriteSourceSize - {128,128} + {75,75} textureRect - {{97,63},{74,124}} + {{1,78},{45,73}} textureRotated @@ -189,13 +189,13 @@ aliases spriteOffset - {0,-4} + {0,-2} spriteSize - {68,118} + {41,71} spriteSourceSize - {128,128} + {75,75} textureRect - {{846,1},{68,118}} + {{76,78},{41,71}} textureRotated @@ -204,13 +204,13 @@ aliases spriteOffset - {0,-4} + {0,-2} spriteSize - {84,94} + {51,57} spriteSourceSize - {128,128} + {75,75} textureRect - {{1,41},{84,94}} + {{955,1},{51,57}} textureRotated @@ -219,13 +219,13 @@ aliases spriteOffset - {0,-4} + {0,-2} spriteSize - {84,98} + {51,59} spriteSourceSize - {128,128} + {75,75} textureRect - {{223,63},{84,98}} + {{516,76},{51,59}} textureRotated @@ -234,43 +234,43 @@ aliases spriteOffset - {-1,-4} + {0,-2} spriteSize - {88,92} + {53,57} spriteSourceSize - {128,128} + {75,75} textureRect - {{1,127},{88,92}} + {{577,69},{53,57}} textureRotated - + 6213.png aliases spriteOffset - {0,-4} + {0,-2} spriteSize - {84,94} + {51,57} spriteSourceSize - {128,128} + {75,75} textureRect - {{323,64},{84,94}} + {{976,54},{51,57}} textureRotated - + 6214.png aliases spriteOffset - {0,-4} + {0,-2} spriteSize - {84,98} + {51,59} spriteSourceSize - {128,128} + {75,75} textureRect - {{419,67},{84,98}} + {{833,1},{51,59}} textureRotated @@ -279,28 +279,28 @@ aliases spriteOffset - {-1,-4} + {0,-2} spriteSize - {88,92} + {53,57} spriteSourceSize - {128,128} + {75,75} textureRect - {{195,149},{88,92}} + {{723,1},{53,57}} textureRotated - + 6216.png aliases spriteOffset - {0,-4} + {0,-2} spriteSize - {84,94} + {51,57} spriteSourceSize - {128,128} + {75,75} textureRect - {{519,67},{84,94}} + {{1014,1},{51,57}} textureRotated @@ -309,58 +309,58 @@ aliases spriteOffset - {0,-4} + {0,-2} spriteSize - {84,98} + {51,59} spriteSourceSize - {128,128} + {75,75} textureRect - {{615,67},{84,98}} + {{870,54},{51,59}} textureRotated - + 6218.png aliases spriteOffset - {-1,-4} + {0,-2} spriteSize - {88,92} + {53,57} spriteSourceSize - {128,128} + {75,75} textureRect - {{289,150},{88,92}} + {{760,60},{53,57}} textureRotated - + 6219.png aliases spriteOffset - {0,-4} + {0,-2} spriteSize - {84,94} + {51,57} spriteSourceSize - {128,128} + {75,75} textureRect - {{715,69},{84,94}} + {{1073,1},{51,57}} textureRotated - + 6220.png aliases spriteOffset - {0,-4} + {0,-2} spriteSize - {84,98} + {51,59} spriteSourceSize - {128,128} + {75,75} textureRect - {{811,71},{84,98}} + {{894,1},{51,59}} textureRotated @@ -369,60 +369,60 @@ aliases spriteOffset - {-1,-4} + {0,-2} spriteSize - {88,92} + {53,57} spriteSourceSize - {128,128} + {75,75} textureRect - {{383,153},{88,92}} + {{778,1},{53,57}} textureRotated - + 6222.png aliases spriteOffset - {0,-4} + {0,-2} spriteSize - {84,94} + {51,57} spriteSourceSize - {128,128} + {75,75} textureRect - {{911,71},{84,94}} + {{1029,60},{51,57}} textureRotated - + 6223.png aliases spriteOffset - {0,-4} + {0,-2} spriteSize - {84,98} + {51,59} spriteSourceSize - {128,128} + {75,75} textureRect - {{95,139},{84,98}} + {{923,54},{51,59}} textureRotated - + 6224.png aliases spriteOffset - {-1,-4} + {0,-2} spriteSize - {88,92} + {53,57} spriteSourceSize - {128,128} + {75,75} textureRect - {{477,153},{88,92}} + {{815,60},{53,57}} textureRotated - + 7002.png @@ -435,9 +435,9 @@ spriteSourceSize {60,62} textureRect - {{241,1},{60,62}} + {{661,1},{60,62}} textureRotated - + 7003.png @@ -450,7 +450,7 @@ spriteSourceSize {65,60} textureRect - {{305,1},{65,60}} + {{632,67},{65,60}} textureRotated @@ -465,7 +465,7 @@ spriteSourceSize {66,76} textureRect - {{768,1},{66,76}} + {{520,1},{66,76}} textureRotated @@ -480,9 +480,9 @@ spriteSourceSize {59,60} textureRect - {{117,1},{59,60}} + {{699,65},{59,60}} textureRotated - + userinfo_icon_skull.png @@ -495,9 +495,9 @@ spriteSourceSize {61,64} textureRect - {{372,1},{61,64}} + {{598,1},{61,64}} textureRotated - + metadata @@ -511,9 +511,9 @@ realTextureFileName skill.png size - {1006,260} + {1125,128} smartupdate - $TexturePacker:SmartUpdate:46869ecaa6bc7313eac74e5e5bf01782:c23b9e16db5c8de90e9e8927fe6b094b:de628d2eabb1e43115cf8c86336e45f6$ + $TexturePacker:SmartUpdate:69aaeb1954079ef28c8d5fc85512e7a8:95bec2c1daec1ac198c64efdfdb078d9:de628d2eabb1e43115cf8c86336e45f6$ textureFileName skill.png diff --git a/assets/resources/game/heros/skill.plist.meta b/assets/resources/game/heros/skill.plist.meta index 95bc6e04..8315ecaf 100644 --- a/assets/resources/game/heros/skill.plist.meta +++ b/assets/resources/game/heros/skill.plist.meta @@ -16,10 +16,10 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 241, + "trimX": 661, "trimY": 1, "width": 60, "height": 62, @@ -62,15 +62,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, - "offsetY": -4, - "trimX": 911, - "trimY": 71, - "width": 84, - "height": 94, - "rawWidth": 128, - "rawHeight": 128, + "offsetY": -2, + "trimX": 1029, + "trimY": 60, + "width": 51, + "height": 57, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -108,15 +108,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, - "offsetY": -4, - "trimX": 715, - "trimY": 69, - "width": 84, - "height": 94, - "rawWidth": 128, - "rawHeight": 128, + "offsetY": -2, + "trimX": 1073, + "trimY": 1, + "width": 51, + "height": 57, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -156,13 +156,13 @@ "trimThreshold": 1, "rotated": true, "offsetX": 0, - "offsetY": -4, - "trimX": 811, - "trimY": 71, - "width": 84, - "height": 98, - "rawWidth": 128, - "rawHeight": 128, + "offsetY": -2, + "trimX": 894, + "trimY": 1, + "width": 51, + "height": 59, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -200,10 +200,10 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 372, + "trimX": 598, "trimY": 1, "width": 61, "height": 64, @@ -246,15 +246,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 571, - "trimY": 153, - "width": 102, - "height": 106, - "rawWidth": 102, - "rawHeight": 106, + "trimX": 78, + "trimY": 1, + "width": 72, + "height": 75, + "rawWidth": 72, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -292,15 +292,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 679, - "trimY": 155, - "width": 102, - "height": 106, - "rawWidth": 102, - "rawHeight": 106, + "trimX": 152, + "trimY": 1, + "width": 72, + "height": 75, + "rawWidth": 72, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -338,15 +338,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 787, - "trimY": 157, - "width": 102, - "height": 106, - "rawWidth": 102, - "rawHeight": 106, + "trimX": 226, + "trimY": 1, + "width": 72, + "height": 75, + "rawWidth": 72, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -384,15 +384,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 895, - "trimY": 157, - "width": 102, - "height": 106, - "rawWidth": 102, - "rawHeight": 106, + "trimX": 300, + "trimY": 1, + "width": 72, + "height": 75, + "rawWidth": 72, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -431,14 +431,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 438, + "offsetX": -1, + "offsetY": -1, + "trimX": 374, "trimY": 1, - "width": 64, - "height": 64, - "rawWidth": 64, - "rawHeight": 64, + "width": 71, + "height": 73, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -479,12 +479,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 504, + "trimX": 1, "trimY": 1, - "width": 64, - "height": 64, - "rawWidth": 64, - "rawHeight": 64, + "width": 75, + "height": 75, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -523,14 +523,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 179, + "offsetX": -1, + "offsetY": -1, + "trimX": 447, "trimY": 1, - "width": 60, - "height": 60, - "rawWidth": 60, - "rawHeight": 60, + "width": 71, + "height": 73, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -568,15 +568,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, - "offsetY": 0, - "trimX": 570, - "trimY": 1, - "width": 64, - "height": 64, - "rawWidth": 64, - "rawHeight": 64, + "offsetY": -1, + "trimX": 149, + "trimY": 78, + "width": 39, + "height": 65, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -614,15 +614,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, - "offsetY": 0, - "trimX": 636, - "trimY": 1, - "width": 64, - "height": 64, - "rawWidth": 64, - "rawHeight": 64, + "offsetY": -2, + "trimX": 447, + "trimY": 76, + "width": 51, + "height": 67, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -660,15 +660,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, - "offsetY": 0, - "trimX": 702, - "trimY": 1, - "width": 64, - "height": 64, - "rawWidth": 64, - "rawHeight": 64, + "offsetY": -2, + "trimX": 374, + "trimY": 76, + "width": 51, + "height": 71, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -708,13 +708,13 @@ "trimThreshold": 1, "rotated": true, "offsetX": 0, - "offsetY": -4, - "trimX": 1, - "trimY": 1, - "width": 38, - "height": 114, - "rawWidth": 128, - "rawHeight": 128, + "offsetY": -2, + "trimX": 216, + "trimY": 78, + "width": 25, + "height": 69, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -754,13 +754,13 @@ "trimThreshold": 1, "rotated": true, "offsetX": 0, - "offsetY": -2, - "trimX": 97, - "trimY": 63, - "width": 74, - "height": 124, - "rawWidth": 128, - "rawHeight": 128, + "offsetY": -1, + "trimX": 1, + "trimY": 78, + "width": 45, + "height": 73, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -800,13 +800,13 @@ "trimThreshold": 1, "rotated": true, "offsetX": 0, - "offsetY": -4, - "trimX": 846, - "trimY": 1, - "width": 68, - "height": 118, - "rawWidth": 128, - "rawHeight": 128, + "offsetY": -2, + "trimX": 76, + "trimY": 78, + "width": 41, + "height": 71, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -846,13 +846,13 @@ "trimThreshold": 1, "rotated": true, "offsetX": 0, - "offsetY": -4, - "trimX": 1, - "trimY": 41, - "width": 84, - "height": 94, - "rawWidth": 128, - "rawHeight": 128, + "offsetY": -2, + "trimX": 955, + "trimY": 1, + "width": 51, + "height": 57, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -892,13 +892,13 @@ "trimThreshold": 1, "rotated": true, "offsetX": 0, - "offsetY": -4, - "trimX": 223, - "trimY": 63, - "width": 84, - "height": 98, - "rawWidth": 128, - "rawHeight": 128, + "offsetY": -2, + "trimX": 516, + "trimY": 76, + "width": 51, + "height": 59, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -936,15 +936,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, - "offsetX": -1, - "offsetY": -4, - "trimX": 1, - "trimY": 127, - "width": 88, - "height": 92, - "rawWidth": 128, - "rawHeight": 128, + "rotated": false, + "offsetX": 0, + "offsetY": -2, + "trimX": 577, + "trimY": 69, + "width": 53, + "height": 57, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -982,15 +982,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, - "offsetY": -4, - "trimX": 323, - "trimY": 64, - "width": 84, - "height": 94, - "rawWidth": 128, - "rawHeight": 128, + "offsetY": -2, + "trimX": 976, + "trimY": 54, + "width": 51, + "height": 57, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1030,13 +1030,13 @@ "trimThreshold": 1, "rotated": true, "offsetX": 0, - "offsetY": -4, - "trimX": 419, - "trimY": 67, - "width": 84, - "height": 98, - "rawWidth": 128, - "rawHeight": 128, + "offsetY": -2, + "trimX": 833, + "trimY": 1, + "width": 51, + "height": 59, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1074,15 +1074,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, - "offsetX": -1, - "offsetY": -4, - "trimX": 195, - "trimY": 149, - "width": 88, - "height": 92, - "rawWidth": 128, - "rawHeight": 128, + "rotated": false, + "offsetX": 0, + "offsetY": -2, + "trimX": 723, + "trimY": 1, + "width": 53, + "height": 57, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1122,13 +1122,13 @@ "trimThreshold": 1, "rotated": true, "offsetX": 0, - "offsetY": -4, - "trimX": 519, - "trimY": 67, - "width": 84, - "height": 94, - "rawWidth": 128, - "rawHeight": 128, + "offsetY": -2, + "trimX": 1014, + "trimY": 1, + "width": 51, + "height": 57, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1166,15 +1166,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, - "offsetY": -4, - "trimX": 615, - "trimY": 67, - "width": 84, - "height": 98, - "rawWidth": 128, - "rawHeight": 128, + "offsetY": -2, + "trimX": 870, + "trimY": 54, + "width": 51, + "height": 59, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1212,15 +1212,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, - "offsetX": -1, - "offsetY": -4, - "trimX": 289, - "trimY": 150, - "width": 88, - "height": 92, - "rawWidth": 128, - "rawHeight": 128, + "rotated": false, + "offsetX": 0, + "offsetY": -2, + "trimX": 760, + "trimY": 60, + "width": 53, + "height": 57, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1258,15 +1258,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, - "offsetX": -1, - "offsetY": -4, - "trimX": 383, - "trimY": 153, - "width": 88, - "height": 92, - "rawWidth": 128, - "rawHeight": 128, + "rotated": false, + "offsetX": 0, + "offsetY": -2, + "trimX": 778, + "trimY": 1, + "width": 53, + "height": 57, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1304,15 +1304,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, - "offsetY": -4, - "trimX": 95, - "trimY": 139, - "width": 84, - "height": 98, - "rawWidth": 128, - "rawHeight": 128, + "offsetY": -2, + "trimX": 923, + "trimY": 54, + "width": 51, + "height": 59, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1350,15 +1350,15 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, - "offsetX": -1, - "offsetY": -4, - "trimX": 477, - "trimY": 153, - "width": 88, - "height": 92, - "rawWidth": 128, - "rawHeight": 128, + "rotated": false, + "offsetX": 0, + "offsetY": -2, + "trimX": 815, + "trimY": 60, + "width": 53, + "height": 57, + "rawWidth": 75, + "rawHeight": 75, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -1399,8 +1399,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 305, - "trimY": 1, + "trimX": 632, + "trimY": 67, "width": 65, "height": 60, "rawWidth": 65, @@ -1445,7 +1445,7 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 768, + "trimX": 520, "trimY": 1, "width": 66, "height": 76, @@ -1488,11 +1488,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 117, - "trimY": 1, + "trimX": 699, + "trimY": 65, "width": 59, "height": 60, "rawWidth": 59, diff --git a/assets/resources/game/heros/skill.png b/assets/resources/game/heros/skill.png index 08285915..24a3c58f 100644 Binary files a/assets/resources/game/heros/skill.png and b/assets/resources/game/heros/skill.png differ diff --git a/assets/resources/game/map/bg 1.png b/assets/resources/game/map/bg 1.png deleted file mode 100644 index 7363ceed..00000000 Binary files a/assets/resources/game/map/bg 1.png and /dev/null differ diff --git a/assets/resources/game/map/bg 1.png.meta b/assets/resources/game/map/bg 1.png.meta deleted file mode 100644 index 8ce82e18..00000000 --- a/assets/resources/game/map/bg 1.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "f62ede4f-6547-4fd9-bf05-7f58a0c5a71f", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "f62ede4f-6547-4fd9-bf05-7f58a0c5a71f@6c48a", - "displayName": "bg 1", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "f62ede4f-6547-4fd9-bf05-7f58a0c5a71f", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "f62ede4f-6547-4fd9-bf05-7f58a0c5a71f@f9941", - "displayName": "bg 1", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 840, - "height": 867, - "rawWidth": 840, - "rawHeight": 867, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -420, - -433.5, - 0, - 420, - -433.5, - 0, - -420, - 433.5, - 0, - 420, - 433.5, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 867, - 840, - 867, - 0, - 0, - 840, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -420, - -433.5, - 0 - ], - "maxPos": [ - 420, - 433.5, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "f62ede4f-6547-4fd9-bf05-7f58a0c5a71f@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "redirect": "f62ede4f-6547-4fd9-bf05-7f58a0c5a71f@f9941" - } -} diff --git a/assets/resources/game/map/grass.png b/assets/resources/game/map/grass.png deleted file mode 100644 index ae08fc70..00000000 Binary files a/assets/resources/game/map/grass.png and /dev/null differ diff --git a/assets/resources/game/map/map1.png b/assets/resources/game/map/map1.png new file mode 100644 index 00000000..b8b389ad Binary files /dev/null and b/assets/resources/game/map/map1.png differ diff --git a/assets/resources/game/map/grass.png.meta b/assets/resources/game/map/map1.png.meta similarity index 72% rename from assets/resources/game/map/grass.png.meta rename to assets/resources/game/map/map1.png.meta index 19518fd2..3db794fd 100644 --- a/assets/resources/game/map/grass.png.meta +++ b/assets/resources/game/map/map1.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.26", "importer": "image", "imported": true, - "uuid": "0ef7b413-953c-498c-94fb-e5f0cb79c7ff", + "uuid": "d1c7b105-783b-4736-aa3d-28fc8dcac7d1", "files": [ ".json", ".png" @@ -10,8 +10,8 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "0ef7b413-953c-498c-94fb-e5f0cb79c7ff@6c48a", - "displayName": "grass", + "uuid": "d1c7b105-783b-4736-aa3d-28fc8dcac7d1@6c48a", + "displayName": "map1", "id": "6c48a", "name": "texture", "userData": { @@ -22,7 +22,7 @@ "mipfilter": "none", "anisotropy": 0, "isUuid": true, - "imageUuidOrDatabaseUri": "0ef7b413-953c-498c-94fb-e5f0cb79c7ff", + "imageUuidOrDatabaseUri": "d1c7b105-783b-4736-aa3d-28fc8dcac7d1", "visible": false }, "ver": "1.0.22", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "0ef7b413-953c-498c-94fb-e5f0cb79c7ff@f9941", - "displayName": "grass", + "uuid": "d1c7b105-783b-4736-aa3d-28fc8dcac7d1@f9941", + "displayName": "map1", "id": "f9941", "name": "spriteFrame", "userData": { @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 1000, - "height": 400, - "rawWidth": 1000, - "rawHeight": 400, + "width": 800, + "height": 1100, + "rawWidth": 800, + "rawHeight": 1100, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -500, - -200, + -400, + -550, 0, - 500, - -200, + 400, + -550, 0, - -500, - 200, + -400, + 550, 0, - 500, - 200, + 400, + 550, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 400, - 1000, - 400, + 1100, + 800, + 1100, 0, 0, - 1000, + 800, 0 ], "nuv": [ @@ -103,18 +103,18 @@ 1 ], "minPos": [ - -500, - -200, + -400, + -550, 0 ], "maxPos": [ - 500, - 200, + 400, + 550, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "0ef7b413-953c-498c-94fb-e5f0cb79c7ff@6c48a", + "imageUuidOrDatabaseUri": "d1c7b105-783b-4736-aa3d-28fc8dcac7d1@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "hasAlpha": true, "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, - "redirect": "0ef7b413-953c-498c-94fb-e5f0cb79c7ff@f9941" + "redirect": "d1c7b105-783b-4736-aa3d-28fc8dcac7d1@f9941" } } diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index 2238e211..aa60e250 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -28,17 +28,17 @@ "_active": true, "_components": [ { - "__id__": 104 + "__id__": 68 }, { - "__id__": 106 + "__id__": 70 }, { - "__id__": 108 + "__id__": 72 } ], "_prefab": { - "__id__": 110 + "__id__": 74 }, "_lpos": { "__type__": "cc.Vec3", @@ -72,7 +72,7 @@ { "__type__": "cc.Node", "_name": "camera", - "_objFlags": 0, + "_objFlags": 512, "__editorExtras__": {}, "_parent": { "__id__": 1 @@ -197,17 +197,17 @@ "_active": true, "_components": [ { - "__id__": 97 + "__id__": 61 }, { - "__id__": 99 + "__id__": 63 }, { - "__id__": 101 + "__id__": 65 } ], "_prefab": { - "__id__": 103 + "__id__": 67 }, "_lpos": { "__type__": "cc.Vec3", @@ -251,29 +251,29 @@ "__id__": 8 }, { - "__id__": 66 + "__id__": 30 }, { - "__id__": 70 + "__id__": 34 }, { - "__id__": 76 + "__id__": 40 }, { - "__id__": 82 + "__id__": 46 }, { - "__id__": 88 + "__id__": 52 } ], "_active": true, "_components": [ { - "__id__": 94 + "__id__": 58 } ], "_prefab": { - "__id__": 96 + "__id__": 60 }, "_lpos": { "__type__": "cc.Vec3", @@ -320,20 +320,20 @@ "_active": true, "_components": [ { - "__id__": 57 + "__id__": 21 }, { - "__id__": 59 + "__id__": 23 }, { - "__id__": 61 + "__id__": 25 }, { - "__id__": 63 + "__id__": 27 } ], "_prefab": { - "__id__": 65 + "__id__": 29 }, "_lpos": { "__type__": "cc.Vec3", @@ -375,22 +375,19 @@ "_children": [ { "__id__": 10 - }, - { - "__id__": 16 } ], "_active": true, "_components": [ { - "__id__": 52 + "__id__": 16 }, { - "__id__": 54 + "__id__": 18 } ], "_prefab": { - "__id__": 56 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -423,7 +420,7 @@ }, { "__type__": "cc.Node", - "_name": "bg 1", + "_name": "map1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -445,7 +442,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 344.267, + "y": 288.441, "z": 0 }, "_lrot": { @@ -485,8 +482,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 840, - "height": 867 + "width": 800, + "height": 1100 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -497,7 +494,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "58xOFzaoRAGI5mASY81ZSe" + "fileId": "98A7Wbv8RC5Y5vwvY2/9M3" }, { "__type__": "cc.Sprite", @@ -522,7 +519,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f62ede4f-6547-4fd9-bf05-7f58a0c5a71f@f9941", + "__uuid__": "d1c7b105-783b-4736-aa3d-28fc8dcac7d1@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -542,7 +539,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "8bLvvPm9pCULcGLsT1TSWH" + "fileId": "53ivRiNDNOFaLFQ4+LYFdZ" }, { "__type__": "cc.PrefabInfo", @@ -552,839 +549,7 @@ "asset": { "__id__": 0 }, - "fileId": "01lHpP7z1PkrQt23iZjGSO", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "grass", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 9 - }, - "_children": [ - { - "__id__": 17 - }, - { - "__id__": 23 - }, - { - "__id__": 29 - }, - { - "__id__": 35 - }, - { - "__id__": 41 - } - ], - "_active": true, - "_components": [ - { - "__id__": 47 - }, - { - "__id__": 49 - } - ], - "_prefab": { - "__id__": 51 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 193.002, - "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": "UI_PointCir", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 16 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 18 - }, - { - "__id__": 20 - } - ], - "_prefab": { - "__id__": 22 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -277.206, - "y": -59.055, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 0.2, - "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__": 17 - }, - "_enabled": true, - "__prefab": { - "__id__": 19 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 121, - "height": 121 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "627ZSqHsVLB5/TutTxef6t" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 17 - }, - "_enabled": true, - "__prefab": { - "__id__": 21 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@27b48", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e7fLe45o9IOLtzAFvrSNOa" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "7dLJo0+d1KNatwMp7bLXuB", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "UI_PointCir-001", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 16 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 24 - }, - { - "__id__": 26 - } - ], - "_prefab": { - "__id__": 28 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -140.481, - "y": -19.237, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 0.2, - "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__": 23 - }, - "_enabled": true, - "__prefab": { - "__id__": 25 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 121, - "height": 121 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "30ymgGRBBLYKPaDrPsqvLh" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 23 - }, - "_enabled": true, - "__prefab": { - "__id__": 27 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@27b48", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "2eagoiPupCWpe2Oa207zmR" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "f5W61dbIdFM47/K11rDhXL", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "UI_PointCir-002", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 16 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 30 - }, - { - "__id__": 32 - } - ], - "_prefab": { - "__id__": 34 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -140.481, - "y": -88.918, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 0.2, - "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__": 29 - }, - "_enabled": true, - "__prefab": { - "__id__": 31 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 121, - "height": 121 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "06PQRSIypNtYHx80T+vLSs" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 29 - }, - "_enabled": true, - "__prefab": { - "__id__": 33 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@27b48", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "40Licp121Cerf3d5gaodUr" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "a3K4ttYJlOlaSia5HpbWah", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "UI_PointCir-003", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 16 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 36 - }, - { - "__id__": 38 - } - ], - "_prefab": { - "__id__": 40 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 1.667, - "y": -19.237, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 0.2, - "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__": 35 - }, - "_enabled": true, - "__prefab": { - "__id__": 37 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 121, - "height": 121 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ec4PsBcT5BjZCYLK5Gjo7s" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 35 - }, - "_enabled": true, - "__prefab": { - "__id__": 39 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@27b48", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d3ul0veZpOWZGJ4uiMpq13" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "98J6bihR1Acrng2idZ4hC4", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "UI_PointCir-004", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 16 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 42 - }, - { - "__id__": 44 - } - ], - "_prefab": { - "__id__": 46 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 1.667, - "y": -88.918, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 0.2, - "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__": 41 - }, - "_enabled": true, - "__prefab": { - "__id__": 43 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 121, - "height": 121 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "23qQFKsghPFpIPBtlct6IX" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 41 - }, - "_enabled": true, - "__prefab": { - "__id__": 45 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@27b48", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a0lbar8iNJeJQFEmCZIHZX" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "feW/JfbX1JAZqbYYCS78aI", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 16 - }, - "_enabled": true, - "__prefab": { - "__id__": 48 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 1000, - "height": 400 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "5eG5Y6QUhF2KtUjm6GXszZ" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 16 - }, - "_enabled": true, - "__prefab": { - "__id__": 50 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "0ef7b413-953c-498c-94fb-e5f0cb79c7ff@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "48xkHlI3xNiqhI9yybIL2f" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "b8+5T5XBlJHZuNoWBV+opX", + "fileId": "7ccFBRhwxMUqtrP7H91DQD", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -1399,7 +564,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", @@ -1427,7 +592,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 19 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1485,7 +650,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 22 }, "_contentSize": { "__type__": "cc.Size", @@ -1513,10 +678,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 24 }, "bgImg": { - "__id__": 54 + "__id__": 18 }, "_id": "" }, @@ -1534,7 +699,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 26 }, "light": { "__uuid__": "319c7eb8-9826-48b6-81e4-82559dbf82a8", @@ -1556,7 +721,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 28 }, "_id": "" }, @@ -1580,7 +745,7 @@ { "__type__": "cc.Node", "_name": "FloorLayer", - "_objFlags": 0, + "_objFlags": 512, "__editorExtras__": {}, "_parent": { "__id__": 7 @@ -1589,11 +754,11 @@ "_active": true, "_components": [ { - "__id__": 67 + "__id__": 31 } ], "_prefab": { - "__id__": 69 + "__id__": 33 }, "_lpos": { "__type__": "cc.Vec3", @@ -1630,11 +795,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", @@ -1668,7 +833,7 @@ { "__type__": "cc.Node", "_name": "EntityLayer1", - "_objFlags": 0, + "_objFlags": 512, "__editorExtras__": {}, "_parent": { "__id__": 7 @@ -1677,14 +842,14 @@ "_active": true, "_components": [ { - "__id__": 71 + "__id__": 35 }, { - "__id__": 73 + "__id__": 37 } ], "_prefab": { - "__id__": 75 + "__id__": 39 }, "_lpos": { "__type__": "cc.Vec3", @@ -1721,11 +886,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 36 }, "_contentSize": { "__type__": "cc.Size", @@ -1749,11 +914,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 38 }, "_id": "" }, @@ -1777,7 +942,7 @@ { "__type__": "cc.Node", "_name": "EntityLayer", - "_objFlags": 0, + "_objFlags": 512, "__editorExtras__": {}, "_parent": { "__id__": 7 @@ -1786,14 +951,14 @@ "_active": true, "_components": [ { - "__id__": 77 + "__id__": 41 }, { - "__id__": 79 + "__id__": 43 } ], "_prefab": { - "__id__": 81 + "__id__": 45 }, "_lpos": { "__type__": "cc.Vec3", @@ -1830,11 +995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 40 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 42 }, "_contentSize": { "__type__": "cc.Size", @@ -1858,11 +1023,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 40 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 44 }, "_id": "" }, @@ -1886,7 +1051,7 @@ { "__type__": "cc.Node", "_name": "EntityLayer2", - "_objFlags": 0, + "_objFlags": 512, "__editorExtras__": {}, "_parent": { "__id__": 7 @@ -1895,14 +1060,14 @@ "_active": true, "_components": [ { - "__id__": 83 + "__id__": 47 }, { - "__id__": 85 + "__id__": 49 } ], "_prefab": { - "__id__": 87 + "__id__": 51 }, "_lpos": { "__type__": "cc.Vec3", @@ -1939,11 +1104,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 46 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 48 }, "_contentSize": { "__type__": "cc.Size", @@ -1967,11 +1132,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 46 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 50 }, "_id": "" }, @@ -1995,7 +1160,7 @@ { "__type__": "cc.Node", "_name": "SkillLayer", - "_objFlags": 0, + "_objFlags": 512, "__editorExtras__": {}, "_parent": { "__id__": 7 @@ -2004,14 +1169,14 @@ "_active": true, "_components": [ { - "__id__": 89 + "__id__": 53 }, { - "__id__": 91 + "__id__": 55 } ], "_prefab": { - "__id__": 93 + "__id__": 57 }, "_lpos": { "__type__": "cc.Vec3", @@ -2048,11 +1213,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 90 + "__id__": 54 }, "_contentSize": { "__type__": "cc.Size", @@ -2076,11 +1241,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 56 }, "light": { "__uuid__": "319c7eb8-9826-48b6-81e4-82559dbf82a8", @@ -2115,7 +1280,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 59 }, "_contentSize": { "__type__": "cc.Size", @@ -2156,7 +1321,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 62 }, "_contentSize": { "__type__": "cc.Size", @@ -2184,7 +1349,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 64 }, "camera": { "__id__": 3 @@ -2193,22 +1358,22 @@ "__id__": 7 }, "mapLayer": { - "__id__": 59 + "__id__": 23 }, "floorLayer": { - "__id__": 66 + "__id__": 30 }, "entityLayer": { - "__id__": 79 + "__id__": 43 }, "entityLayer1": { - "__id__": 73 + "__id__": 37 }, "entityLayer2": { - "__id__": 85 + "__id__": 49 }, "SkillLayer": { - "__id__": 91 + "__id__": 55 }, "isFollowPlayer": true, "_id": "" @@ -2227,7 +1392,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 102 + "__id__": 66 }, "_id": "" }, @@ -2258,7 +1423,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 69 }, "_contentSize": { "__type__": "cc.Size", @@ -2286,7 +1451,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 71 }, "_cameraComponent": { "__id__": 3 @@ -2308,7 +1473,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 73 }, "_alignFlags": 45, "_target": null, diff --git a/assets/resources/game/monster/orc1.prefab b/assets/resources/game/monster/orc1.prefab index af2d0422..f5d37319 100644 --- a/assets/resources/game/monster/orc1.prefab +++ b/assets/resources/game/monster/orc1.prefab @@ -397,8 +397,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -0.65, - "y": 0.65, + "x": -0.8, + "y": 0.8, "z": 1 }, "_mobility": 0, @@ -1540,7 +1540,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 52.719, + "y": 60.211, "z": 0 }, "_lrot": { diff --git a/assets/resources/game/monster/orc2.prefab b/assets/resources/game/monster/orc2.prefab index be757c04..9ce416ab 100644 --- a/assets/resources/game/monster/orc2.prefab +++ b/assets/resources/game/monster/orc2.prefab @@ -397,8 +397,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -0.65, - "y": 0.65, + "x": -0.8, + "y": 0.8, "z": 1 }, "_mobility": 0, @@ -1540,7 +1540,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 52.719, + "y": 66.455, "z": 0 }, "_lrot": { diff --git a/assets/resources/game/monster/orc3.prefab b/assets/resources/game/monster/orc3.prefab index 23ed4145..675efbcb 100644 --- a/assets/resources/game/monster/orc3.prefab +++ b/assets/resources/game/monster/orc3.prefab @@ -397,8 +397,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -0.65, - "y": 0.65, + "x": -0.8, + "y": 0.8, "z": 1 }, "_mobility": 0, @@ -1540,7 +1540,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 52.719, + "y": 68.953, "z": 0 }, "_lrot": { diff --git a/assets/resources/gui/mon_box.prefab b/assets/resources/gui/mon_box.prefab index 19f565b2..330fd67d 100644 --- a/assets/resources/gui/mon_box.prefab +++ b/assets/resources/gui/mon_box.prefab @@ -329,12 +329,12 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 173, - "height": 214.44000244140625 + "width": 100, + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5512716921767747, + "x": 0.5, "y": 0.03362245829164751 }, "_id": "" @@ -365,11 +365,8 @@ "b": 255, "a": 255 }, - "_skeletonData": { - "__uuid__": "015aa7dc-78fb-457f-b83e-ed78166b1088", - "__expectedType__": "sp.SkeletonData" - }, - "defaultSkin": "Character04", + "_skeletonData": null, + "defaultSkin": "", "defaultAnimation": "", "_premultipliedAlpha": true, "_timeScale": 1, diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index d4fabc4e..bebdf30e 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -8802,8 +8802,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 109, - "height": 137 + "width": 75, + "height": 75 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -8851,8 +8851,8 @@ "y": 0 }, "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, + "_fillRange": 1, + "_isTrimmedMode": false, "_useGrayscale": false, "_atlas": null, "_id": "" @@ -9902,8 +9902,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 96, - "height": 134 + "width": 75, + "height": 75 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9944,15 +9944,15 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, "y": 0 }, "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, + "_fillRange": 1, + "_isTrimmedMode": false, "_useGrayscale": false, "_atlas": null, "_id": "" @@ -11002,8 +11002,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 109, - "height": 134 + "width": 75, + "height": 75 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -11044,15 +11044,15 @@ }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, "y": 0 }, "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, + "_fillRange": 1, + "_isTrimmedMode": false, "_useGrayscale": false, "_atlas": null, "_id": "" @@ -12141,15 +12141,15 @@ "_spriteFrame": null, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, "y": 0 }, "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, + "_fillRange": 1, + "_isTrimmedMode": false, "_useGrayscale": false, "_atlas": null, "_id": "" @@ -13238,7 +13238,7 @@ "_spriteFrame": null, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -13246,7 +13246,7 @@ }, "_fillStart": 0, "_fillRange": 0, - "_isTrimmedMode": true, + "_isTrimmedMode": false, "_useGrayscale": false, "_atlas": null, "_id": "" diff --git a/assets/script/Main.ts b/assets/script/Main.ts index fbd3cfe3..34682c30 100644 --- a/assets/script/Main.ts +++ b/assets/script/Main.ts @@ -19,8 +19,8 @@ const { ccclass, property } = _decorator; @ccclass('Main') export class Main extends Root { start() { - if (DEBUG) profiler.showStats(); - PhysicsSystem2D.instance.debugDrawFlags = EPhysics2DDrawFlags.Aabb + // if (DEBUG) profiler.showStats(); + // PhysicsSystem2D.instance.debugDrawFlags = EPhysics2DDrawFlags.Aabb // // | EPhysics2DDrawFlags.Pair // |EPhysics2DDrawFlags.CenterOfMass // |EPhysics2DDrawFlags.Joint diff --git a/assets/script/game/common/config/MissionSet.ts b/assets/script/game/common/config/MissionSet.ts index 41345a11..9eaba8a3 100644 --- a/assets/script/game/common/config/MissionSet.ts +++ b/assets/script/game/common/config/MissionSet.ts @@ -1,13 +1,13 @@ export const MissionNum = [1,2,3] export const MonsetList = { 1:{ - 1:[1001,1002,1003], + 1:[1001,1002,1003,1021,1022,1023,1031,1032,1033,1011,1012,1013,1041,1042,1043], }, 2:{ - 1:[1001,1002,1003], + 1:[1001,1002,1003,1021,1022,1023,1031,1032,1033,1011,1012,1013,1041,1042,1043], }, 3:{ - 1:[1001,1002,1003], + 1:[1001,1002,1003,1021,1022,1023,1031,1032,1033,1011,1012,1013,1041,1042,1043], }, } diff --git a/assets/script/game/common/config/MonSet.ts b/assets/script/game/common/config/MonSet.ts index c93ac703..757072d6 100644 --- a/assets/script/game/common/config/MonSet.ts +++ b/assets/script/game/common/config/MonSet.ts @@ -2,10 +2,32 @@ export const MonSet={ 1001:{uuid: 1001,path: "ge1",type: 1,level: 1,name: "战斗哥",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "orc"}, - 1002:{uuid: 1002,path: "ge2",type: 1,level: 1,name: "墨西哥",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, - skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "orc"}, - + skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "orc"}, 1003:{uuid: 1003,path: "ge3",type: 1,level: 1,name: "铁头哥",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "orc"}, + 1011:{uuid: 1011,path: "orc1",type: 1,level: 1,name: "森林兽人",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, + skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "orc"}, + 1012:{uuid: 1012,path: "orc2",type: 1,level: 1,name: "荒野兽人",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, + skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "orc"}, + 1013:{uuid: 1013,path: "orc3",type: 1,level: 1,name: "兽人战士",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, + skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "orc"}, + 1021:{uuid: 1021,path: "gou1",type: 1,level: 1,name: "黄皮豺狼",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, + skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "gou"}, + 1022:{uuid: 1022,path: "gou2",type: 1,level: 1,name: "白皮豺狼",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, + skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "gou"}, + 1023:{uuid: 1023,path: "gou3",type: 1,level: 1,name: "灰皮豺狼",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, + skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "gou"}, + 1031:{uuid: 1031,path: "gou1",type: 1,level: 1,name: "独眼巨人",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, + skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "gou"}, + 1032:{uuid: 1032,path: "gou2",type: 1,level: 1,name: "狂暴独眼",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, + skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "gou"}, + 1033:{uuid: 1033,path: "gou3",type: 1,level: 1,name: "独眼首领",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, + skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "gou"}, + 1041:{uuid: 1041,path: "ys1",type: 1,level: 1,name: "火元素",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, + skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "gou"}, + 1042:{uuid: 1042,path: "ys2",type: 1,level: 1,name: "冰元素",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, + skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "ys"}, + 1043:{uuid: 1043,path: "ys3",type: 1,level: 1,name: "气元素",atk: 4,hp: 24,atk_cd: 2,power: 50,speed: 30, + skill: "base",max_skill: "base",skill_uuid: 9001,max_skill_uuid: 1001,word: "守护",info: "自身护盾", atktype: "攻击型",mon: "ys"}, } \ No newline at end of file diff --git a/extensions/Previewer/browser.js b/extensions/Previewer/browser.js new file mode 100644 index 00000000..4039613e --- /dev/null +++ b/extensions/Previewer/browser.js @@ -0,0 +1,11 @@ +"use strict"; + +exports.methods = { + open() { + Editor.Panel.open("previewer"); + }, +}; + +exports.load = function () {}; + +exports.unload = function () {}; diff --git a/extensions/Previewer/i18n/en.js b/extensions/Previewer/i18n/en.js new file mode 100644 index 00000000..2b86a1eb --- /dev/null +++ b/extensions/Previewer/i18n/en.js @@ -0,0 +1,4 @@ +module.exports = { + title: "Previewer", + description: "Real time previewer, support version 3.0.0", +}; diff --git a/extensions/Previewer/i18n/zh.js b/extensions/Previewer/i18n/zh.js new file mode 100644 index 00000000..744c94b7 --- /dev/null +++ b/extensions/Previewer/i18n/zh.js @@ -0,0 +1,4 @@ +module.exports = { + title: "预览器", + description: "实时预览器，支持3.0.0版本", +}; diff --git a/extensions/Previewer/package.json b/extensions/Previewer/package.json new file mode 100644 index 00000000..df9e03d3 --- /dev/null +++ b/extensions/Previewer/package.json @@ -0,0 +1,45 @@ +{ + "name": "previewer", + "package_version": 2, + "version": "3.0.2", + "description": "i18n:previewer.description", + "author": "rainrcn", + "main": "browser.js", + "panels": { + "default": { + "title": "i18n:previewer.title", + "type": "dockable", + "icon": "./static/icon.png", + "main": "./panels/default.js" + } + }, + "contributions": { + "messages": { + "scene:ready": { + "methods": [ + "default.sceneReady" + ] + }, + "open": { + "methods": [ + "open" + ] + }, + "reload": { + "public": true, + "methods": [ + "default.openFrame" + ] + } + }, + "menu": [ + { + "path": "i18n:menu.panel", + "label": "i18n:previewer.title", + "icon": "./static/icon.png", + "message": "open" + } + ] + }, + "_storeId": "63edaf3705d076d4e8df2873c1b77b32" +} diff --git a/extensions/Previewer/panels/default.js b/extensions/Previewer/panels/default.js new file mode 100644 index 00000000..e7040c27 --- /dev/null +++ b/extensions/Previewer/panels/default.js @@ -0,0 +1 @@ +const _0x2cb3=['\x20{\x0a\x20\x20\x20\x20width:\x20100%;\x0a\x20\x20\x20\x20height:\x20100%;\x0a\x20\x20\x20\x20border:\x20none;\x0a\x20\x20\x20\x20background-color:\x20transparent;\x0a\x20\x20\x20\x20z-index:\x200;\x0a\x20\x20\x20\x20opacity:\x200;\x0a\x20\x20\x20\x20transition:\x20opacity\x201s;\x0a\x20\x20}\x0a\x20\x20#previewer_loading_','style','is-hidden','query-ip-list','methods','classList','add','\x20{\x0a\x20\x20\x20\x20position:\x20absolute;\x0a\x20\x20\x20\x20z-index:\x201;\x0a\x20\x20\x20\x20display:\x20inline-block;\x0a\x20\x20\x20\x20left:\x20calc(50%\x20-\x206px);\x0a\x20\x20\x20\x20top:\x20calc(50%\x20-\x206px);\x0a\x20\x20}\x0a\x20\x20#previewer_loading_','getTime','Message','listeners','ready','.is-hidden\x20{\x0a\x20\x20\x20\x20display:\x20none;\x0a\x20\x20}\x0a','sceneLoading','hidden','$frame','openFrame','bind','\x20{\x0a\x20\x20\x20\x20position:\x20relative;\x0a\x20\x20\x20\x20width:\x20100%;\x0a\x20\x20\x20\x20height:\x20100%;\x0a\x20\x20\x20\x20overflow:\x20hidden;\x0a\x20\x20}\x0a\x20\x20#previewer_frame_','\x0a\x20\x20#previewer_','server','closeFrame','\x22\x20allowfullscreen=\x22true\x22\x20allowtransparency=\x22true\x22\x20scrolling=\x22no\x22\x20/>\x0a\x20\x20\x0a','$loading','\x0a\x20\x20\x0a\x20\x20\x20\x20\x0a\x20\x20\x20\x20{const _0x2f609a=await Editor[_0x2687('0x9')]['request'](_0x2687('0x14'),_0x2687('0x3'));const _0x5b4b00=await Editor['Message'][_0x2687('0x1e')]('server','query-port');this['$'][_0x2687('0xf')]['hidden']=![];this['$']['$frame'][_0x2687('0x1b')]='http://'+_0x2f609a[0x0]+':'+_0x5b4b00+'/';_0x20c640[_0x2687('0x1d')]=!![];clearTimeout(_0x476a78);},0x3e8);},'onloadFrame'(){if(!this['$'][_0x2687('0x17')][_0x2687('0x5')]['contains']('is-hidden')){this['$'][_0x2687('0x17')][_0x2687('0x5')][_0x2687('0x6')](_0x2687('0x2'));}_0x20c640[_0x2687('0xd')]=![];this['$'][_0x2687('0xf')][_0x2687('0x1')]['opacity']=0x1;}};exports[_0x2687('0xa')]={'hide'(){this[_0x2687('0x15')]();},'show'(){this[_0x2687('0x10')]();}};exports[_0x2687('0xb')]=function(){this['$'][_0x2687('0xf')]['onload']=this['onloadFrame'][_0x2687('0x11')](this);this['openFrame']();};exports['beforeClose']=function(){};exports['close']=function(){}; \ No newline at end of file diff --git a/extensions/Previewer/static/icon.png b/extensions/Previewer/static/icon.png new file mode 100644 index 00000000..dac6b57a Binary files /dev/null and b/extensions/Previewer/static/icon.png differ diff --git a/settings/v2/packages/engine.json b/settings/v2/packages/engine.json index 9f8bf296..4f30919c 100644 --- a/settings/v2/packages/engine.json +++ b/settings/v2/packages/engine.json @@ -152,6 +152,6 @@ }, "__version__": "1.0.8", "macroConfig": { - "BATCHER2D_MEM_INCREMENT": 1440 + "BATCHER2D_MEM_INCREMENT": 144 } }