diff --git a/assets/resources/game/map/start.anim b/assets/resources/game/map/start.anim new file mode 100644 index 00000000..361f87c5 --- /dev/null +++ b/assets/resources/game/map/start.anim @@ -0,0 +1,258 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "start", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.4166666666666667, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [], + "_additiveSettings": { + "__id__": 11 + }, + "_auxiliaryCurveEntries": [] + }, + { + "__type__": "cc.animation.VectorTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + }, + "proxy": null + }, + "_channels": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + }, + { + "__id__": 9 + } + ], + "_nComponents": 3 + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + "scale" + ] + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 4 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.20833333333333334, + 0.4166666666666667 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1.5, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 6 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.20833333333333334, + 0.4166666666666667 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1.5, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 8 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.20833333333333334, + 0.4166666666666667 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 10 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/map/start.anim.meta b/assets/resources/game/map/start.anim.meta new file mode 100644 index 00000000..0c632b61 --- /dev/null +++ b/assets/resources/game/map/start.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "fcb14957-9017-47a3-8479-b74c7ecc2fb0", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "start" + } +} diff --git a/assets/resources/game/map/start.prefab b/assets/resources/game/map/start.prefab new file mode 100644 index 00000000..5f4f51d0 --- /dev/null +++ b/assets/resources/game/map/start.prefab @@ -0,0 +1,63 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "start", + "_objFlags": 0, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "asyncLoadAssets": false, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "start", + "_objFlags": 0, + "_parent": null, + "_children": [], + "_active": true, + "_components": [], + "_prefab": { + "__id__": 2 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "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 + }, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c46/YsCPVOJYA4mWEpNYRx" + } +] \ No newline at end of file diff --git a/assets/resources/game/map/start.prefab.meta b/assets/resources/game/map/start.prefab.meta new file mode 100644 index 00000000..c14db0c5 --- /dev/null +++ b/assets/resources/game/map/start.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "3df87a09-5bb7-4188-a213-aef4b292ad05", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "start" + } +} diff --git a/assets/resources/gui/gui.plist b/assets/resources/gui/gui.plist index 0f333c95..e51e8534 100644 --- a/assets/resources/gui/gui.plist +++ b/assets/resources/gui/gui.plist @@ -15,9 +15,9 @@ spriteSourceSize {94,118} textureRect - {{689,645},{94,118}} + {{955,197},{94,118}} textureRotated - + 02.png @@ -30,7 +30,7 @@ spriteSourceSize {64,63} textureRect - {{569,524},{64,63}} + {{1347,752},{64,63}} textureRotated @@ -45,7 +45,7 @@ spriteSourceSize {64,62} textureRect - {{1426,807},{64,62}} + {{1153,955},{64,62}} textureRotated @@ -60,7 +60,7 @@ spriteSourceSize {103,117} textureRect - {{689,526},{103,117}} + {{957,479},{103,117}} textureRotated @@ -90,9 +90,9 @@ spriteSourceSize {44,42} textureRect - {{1315,531},{44,42}} + {{395,970},{44,42}} textureRotated - + 128.png @@ -105,9 +105,9 @@ spriteSourceSize {97,96} textureRect - {{1166,792},{97,96}} + {{714,280},{97,96}} textureRotated - + 129.png @@ -120,7 +120,7 @@ spriteSourceSize {20,20} textureRect - {{331,806},{20,20}} + {{427,916},{20,20}} textureRotated @@ -150,7 +150,7 @@ spriteSourceSize {100,100} textureRect - {{660,881},{100,100}} + {{1331,441},{100,100}} textureRotated @@ -165,7 +165,7 @@ spriteSourceSize {82,94} textureRect - {{924,887},{82,94}} + {{1190,712},{82,94}} textureRotated @@ -195,9 +195,9 @@ spriteSourceSize {84,106} textureRect - {{1456,577},{84,106}} + {{1331,355},{84,106}} textureRotated - + 87.png @@ -210,9 +210,9 @@ spriteSourceSize {100,121} textureRect - {{924,785},{100,121}} + {{1030,728},{100,121}} textureRotated - + 90.png @@ -225,9 +225,9 @@ spriteSourceSize {119,113} textureRect - {{809,767},{119,113}} + {{1076,597},{119,113}} textureRotated - + 91.png @@ -240,7 +240,7 @@ spriteSourceSize {124,114} textureRect - {{809,641},{124,114}} + {{914,728},{124,114}} textureRotated @@ -255,52 +255,7 @@ spriteSourceSize {101,117} textureRect - {{1047,792},{101,117}} - textureRotated - - - 95.png - - aliases - - spriteOffset - {0,0} - spriteSize - {97,125} - spriteSourceSize - {97,125} - textureRect - {{288,832},{97,125}} - textureRotated - - - 96.png - - aliases - - spriteOffset - {0,0} - spriteSize - {98,125} - spriteSourceSize - {98,125} - textureRect - {{932,456},{98,125}} - textureRotated - - - 97.png - - aliases - - spriteOffset - {0,0} - spriteSize - {97,125} - spriteSourceSize - {97,125} - textureRect - {{932,556},{97,125}} + {{94,916},{101,117}} textureRotated @@ -315,7 +270,7 @@ spriteSourceSize {139,117} textureRect - {{1315,577},{139,117}} + {{816,479},{139,117}} textureRotated @@ -330,9 +285,9 @@ spriteSourceSize {129,123} textureRect - {{935,187},{129,123}} + {{911,854},{129,123}} textureRotated - + Arrow.png @@ -345,9 +300,9 @@ spriteSourceSize {160,48} textureRect - {{387,914},{140,38}} + {{1347,95},{140,38}} textureRotated - + Artboard 16.png @@ -405,7 +360,7 @@ spriteSourceSize {95,61} textureRect - {{1264,906},{95,61}} + {{1219,955},{95,61}} textureRotated @@ -510,7 +465,7 @@ spriteSourceSize {160,160} textureRect - {{549,590},{138,138}} + {{816,339},{138,138}} textureRotated @@ -525,7 +480,7 @@ spriteSourceSize {160,160} textureRect - {{1219,401},{128,142}} + {{802,598},{128,142}} textureRotated @@ -540,7 +495,7 @@ spriteSourceSize {160,160} textureRect - {{1055,674},{120,116}} + {{1186,479},{120,116}} textureRotated @@ -555,9 +510,9 @@ spriteSourceSize {160,160} textureRect - {{1396,1},{142,148}} + {{773,47},{142,148}} textureRotated - + Cartoon RPG UI_Game Icon - Diamond.png @@ -570,9 +525,9 @@ spriteSourceSize {160,160} textureRect - {{1363,307},{148,134}} + {{917,47},{148,134}} textureRotated - + Cartoon RPG UI_Game Icon - Fire Resistant Gem.png @@ -585,7 +540,7 @@ spriteSourceSize {160,160} textureRect - {{1059,532},{140,140}} + {{813,197},{140,140}} textureRotated @@ -600,9 +555,9 @@ spriteSourceSize {160,160} textureRect - {{678,378},{114,146}} + {{1051,229},{114,146}} textureRotated - + Cartoon RPG UI_Game Icon - Leaf.png @@ -615,7 +570,7 @@ spriteSourceSize {160,160} textureRect - {{1363,443},{132,148}} + {{1053,95},{132,148}} textureRotated @@ -630,7 +585,7 @@ spriteSourceSize {160,160} textureRect - {{794,371},{144,136}} + {{678,378},{144,136}} textureRotated @@ -645,7 +600,7 @@ spriteSourceSize {160,160} textureRect - {{794,517},{136,122}} + {{1193,355},{136,122}} textureRotated @@ -660,9 +615,9 @@ spriteSourceSize {160,160} textureRect - {{1201,532},{112,142}} + {{1049,345},{112,142}} textureRotated - + Cartoon RPG UI_Game Icon - Mana Potion.png @@ -675,7 +630,7 @@ spriteSourceSize {160,160} textureRect - {{1059,416},{114,146}} + {{1199,239},{114,146}} textureRotated @@ -690,9 +645,9 @@ spriteSourceSize {160,160} textureRect - {{685,741},{138,122}} + {{771,853},{138,122}} textureRotated - + Cartoon RPG UI_Game Icon - Water Gem.png @@ -705,7 +660,7 @@ spriteSourceSize {160,160} textureRect - {{935,318},{122,136}} + {{1062,459},{122,136}} textureRotated @@ -720,7 +675,7 @@ spriteSourceSize {160,160} textureRect - {{925,655},{128,128}} + {{946,598},{128,128}} textureRotated @@ -735,7 +690,7 @@ spriteSourceSize {160,160} textureRect - {{387,590},{160,160}} + {{288,592},{160,160}} textureRotated @@ -750,7 +705,7 @@ spriteSourceSize {160,160} textureRect - {{387,752},{160,160}} + {{288,754},{160,160}} textureRotated @@ -765,7 +720,7 @@ spriteSourceSize {160,160} textureRect - {{773,47},{160,160}} + {{450,524},{160,160}} textureRotated @@ -780,7 +735,7 @@ spriteSourceSize {160,160} textureRect - {{1060,95},{160,160}} + {{450,686},{160,160}} textureRotated @@ -795,7 +750,7 @@ spriteSourceSize {160,160} textureRect - {{1222,95},{160,160}} + {{450,848},{160,160}} textureRotated @@ -810,7 +765,7 @@ spriteSourceSize {160,160} textureRect - {{1384,145},{160,160}} + {{612,524},{160,160}} textureRotated @@ -829,21 +784,6 @@ textureRotated - GuardIcon.png - - aliases - - spriteOffset - {0,0} - spriteSize - {82,91} - spriteSourceSize - {82,91} - textureRect - {{1008,895},{82,91}} - textureRotated - - Heroes_icon.png aliases @@ -855,7 +795,7 @@ spriteSourceSize {41,48} textureRect - {{1428,871},{41,48}} + {{1264,886},{41,48}} textureRotated @@ -870,9 +810,9 @@ spriteSourceSize {35,32} textureRect - {{1513,475},{35,32}} + {{1190,808},{35,32}} textureRotated - + Option_icon.png @@ -885,9 +825,9 @@ spriteSourceSize {42,43} textureRect - {{1361,939},{42,43}} + {{1307,886},{42,43}} textureRotated - + Rounded Rectangle 1029 copy 10.png @@ -915,9 +855,9 @@ spriteSourceSize {72,40} textureRect - {{870,888},{72,40}} + {{771,977},{72,40}} textureRotated - + Rounded Rectangle 795.png @@ -930,7 +870,7 @@ spriteSourceSize {238,41} textureRect - {{288,592},{238,41}} + {{1396,1},{238,41}} textureRotated @@ -945,9 +885,9 @@ spriteSourceSize {49,42} textureRect - {{634,524},{49,42}} + {{956,425},{49,42}} textureRotated - + UI-02.png @@ -960,9 +900,9 @@ spriteSourceSize {105,10} textureRect - {{1535,307},{105,10}} + {{612,1007},{105,10}} textureRotated - + UI-03.png @@ -975,7 +915,7 @@ spriteSourceSize {111,16} textureRect - {{1518,685},{111,16}} + {{1421,543},{111,16}} textureRotated @@ -990,9 +930,9 @@ spriteSourceSize {138,123} textureRect - {{935,47},{138,123}} + {{774,728},{138,123}} textureRotated - + bg1.png @@ -1020,9 +960,9 @@ spriteSourceSize {111,109} textureRect - {{1405,696},{111,109}} + {{1153,842},{111,109}} textureRotated - + btn green.png @@ -1050,7 +990,7 @@ spriteSourceSize {71,71} textureRect - {{1101,895},{71,71}} + {{1274,752},{71,71}} textureRotated @@ -1065,7 +1005,7 @@ spriteSourceSize {97,97} textureRect - {{1264,807},{97,97}} + {{1310,653},{97,97}} textureRotated @@ -1080,7 +1020,7 @@ spriteSourceSize {180,38} textureRect - {{370,550},{180,38}} + {{213,970},{180,38}} textureRotated @@ -1095,7 +1035,7 @@ spriteSourceSize {38,38} textureRect - {{1492,807},{38,38}} + {{773,197},{38,38}} textureRotated @@ -1110,9 +1050,9 @@ spriteSourceSize {112,111} textureRect - {{1177,676},{112,111}} + {{1197,597},{112,111}} textureRotated - + dun2.png @@ -1125,9 +1065,9 @@ spriteSourceSize {112,109} textureRect - {{1291,696},{112,109}} + {{1042,851},{112,109}} textureRotated - + gbar.png @@ -1140,9 +1080,9 @@ spriteSourceSize {166,20} textureRect - {{1513,307},{166,20}} + {{845,979},{166,20}} textureRotated - + gbg.png @@ -1155,9 +1095,9 @@ spriteSourceSize {212,26} textureRect - {{331,592},{212,26}} + {{213,916},{212,26}} textureRotated - + gh2.png @@ -1170,7 +1110,7 @@ spriteSourceSize {160,160} textureRect - {{773,209},{160,160}} + {{612,686},{160,160}} textureRotated @@ -1185,22 +1125,7 @@ spriteSourceSize {109,108} textureRect - {{549,866},{109,108}} - textureRotated - - - hero_box.png - - aliases - - spriteOffset - {0,0} - spriteSize - {134,134} - spriteSourceSize - {134,134} - textureRect - {{549,730},{134,134}} + {{1310,543},{109,108}} textureRotated @@ -1230,9 +1155,9 @@ spriteSourceSize {106,91} textureRect - {{762,888},{106,91}} + {{956,317},{106,91}} textureRotated - + magic.png @@ -1245,7 +1170,7 @@ spriteSourceSize {67,53} textureRect - {{714,280},{67,53}} + {{1,950},{67,53}} textureRotated @@ -1260,10 +1185,25 @@ spriteSourceSize {157,157} textureRect - {{1060,257},{157,157}} + {{612,848},{157,157}} textureRotated + play_character_target.png + + aliases + + spriteOffset + {0,0} + spriteSize + {128,56} + spriteSourceSize + {128,56} + textureRect + {{1132,712},{128,56}} + textureRotated + + redbar.png aliases @@ -1275,7 +1215,7 @@ spriteSourceSize {129,8} textureRect - {{387,954},{129,8}} + {{845,1001},{129,8}} textureRotated @@ -1290,7 +1230,7 @@ spriteSourceSize {191,26} textureRect - {{359,592},{191,26}} + {{774,524},{191,26}} textureRotated @@ -1305,7 +1245,7 @@ spriteSourceSize {216,8} textureRect - {{351,540},{216,8}} + {{213,960},{216,8}} textureRotated @@ -1350,7 +1290,7 @@ spriteSourceSize {1024,1024} textureRect - {{1219,257},{142,142}} + {{1203,95},{142,142}} textureRotated @@ -1365,9 +1305,9 @@ spriteSourceSize {32,12} textureRect - {{1264,969},{32,12}} + {{802,524},{32,12}} textureRotated - + shuaxin.png @@ -1380,9 +1320,9 @@ spriteSourceSize {61,69} textureRect - {{1363,807},{61,69}} + {{370,524},{61,69}} textureRotated - + status_icon_agility_1.png @@ -1395,7 +1335,7 @@ spriteSourceSize {32,32} textureRect - {{1513,512},{32,32}} + {{1227,808},{32,32}} textureRotated @@ -1425,7 +1365,7 @@ spriteSourceSize {32,32} textureRect - {{94,892},{30,32}} + {{1329,825},{30,32}} textureRotated @@ -1440,7 +1380,7 @@ spriteSourceSize {32,32} textureRect - {{1492,847},{32,32}} + {{56,950},{32,32}} textureRotated @@ -1455,7 +1395,7 @@ spriteSourceSize {32,32} textureRect - {{1406,939},{32,32}} + {{773,237},{32,32}} textureRotated @@ -1470,7 +1410,7 @@ spriteSourceSize {32,32} textureRect - {{1471,881},{32,32}} + {{1007,425},{32,32}} textureRotated @@ -1485,7 +1425,7 @@ spriteSourceSize {32,32} textureRect - {{1505,881},{32,32}} + {{56,984},{32,32}} textureRotated @@ -1500,7 +1440,7 @@ spriteSourceSize {32,32} textureRect - {{1440,921},{32,32}} + {{1274,711},{32,32}} textureRotated @@ -1515,7 +1455,7 @@ spriteSourceSize {32,32} textureRect - {{1474,915},{32,32}} + {{1361,818},{32,32}} textureRotated @@ -1530,7 +1470,7 @@ spriteSourceSize {32,32} textureRect - {{1474,949},{32,32}} + {{1013,979},{32,32}} textureRotated @@ -1545,7 +1485,7 @@ spriteSourceSize {32,32} textureRect - {{1508,915},{32,32}} + {{1047,965},{32,32}} textureRotated @@ -1560,9 +1500,9 @@ spriteSourceSize {32,32} textureRect - {{1,950},{30,32}} + {{1395,818},{30,32}} textureRotated - + status_icon_defense_80.png @@ -1575,7 +1515,7 @@ spriteSourceSize {32,32} textureRect - {{35,950},{30,32}} + {{1361,852},{30,32}} textureRotated @@ -1590,9 +1530,9 @@ spriteSourceSize {96,96} textureRect - {{1174,891},{90,88}} + {{1347,241},{90,88}} textureRotated - + status_icon_disarmed_132.png @@ -1605,9 +1545,9 @@ spriteSourceSize {32,32} textureRect - {{69,950},{30,32}} + {{1395,852},{30,32}} textureRotated - + status_icon_exhausted_50.png @@ -1620,7 +1560,7 @@ spriteSourceSize {32,32} textureRect - {{1508,949},{32,32}} + {{1081,965},{32,32}} textureRotated @@ -1635,7 +1575,7 @@ spriteSourceSize {32,32} textureRect - {{126,916},{32,32}} + {{1115,965},{32,32}} textureRotated @@ -1650,7 +1590,7 @@ spriteSourceSize {32,32} textureRect - {{160,916},{32,32}} + {{1316,931},{32,32}} textureRotated @@ -1665,7 +1605,7 @@ spriteSourceSize {32,32} textureRect - {{103,950},{30,32}} + {{1385,886},{30,32}} textureRotated @@ -1680,7 +1620,7 @@ spriteSourceSize {32,32} textureRect - {{194,916},{32,32}} + {{1316,965},{32,32}} textureRotated @@ -1695,7 +1635,7 @@ spriteSourceSize {32,32} textureRect - {{137,950},{30,32}} + {{1351,918},{30,32}} textureRotated @@ -1710,7 +1650,7 @@ spriteSourceSize {32,32} textureRect - {{228,916},{32,32}} + {{1351,884},{32,32}} textureRotated @@ -1725,7 +1665,7 @@ spriteSourceSize {32,32} textureRect - {{695,49},{32,32}} + {{1350,950},{32,32}} textureRotated @@ -1740,7 +1680,7 @@ spriteSourceSize {32,32} textureRect - {{695,83},{32,32}} + {{1385,918},{32,32}} textureRotated @@ -1755,7 +1695,7 @@ spriteSourceSize {32,32} textureRect - {{695,117},{32,32}} + {{1384,952},{32,32}} textureRotated @@ -1770,7 +1710,7 @@ spriteSourceSize {32,32} textureRect - {{729,47},{32,32}} + {{1350,984},{32,32}} textureRotated @@ -1785,7 +1725,7 @@ spriteSourceSize {32,32} textureRect - {{171,950},{30,32}} + {{1384,986},{30,32}} textureRotated @@ -1800,7 +1740,7 @@ spriteSourceSize {32,32} textureRect - {{729,81},{32,32}} + {{695,49},{32,32}} textureRotated @@ -1815,7 +1755,7 @@ spriteSourceSize {32,32} textureRect - {{729,115},{32,32}} + {{695,83},{32,32}} textureRotated @@ -1830,7 +1770,7 @@ spriteSourceSize {63,59} textureRect - {{1363,878},{63,59}} + {{1264,825},{63,59}} textureRotated @@ -1845,9 +1785,9 @@ spriteSourceSize {35,14} textureRect - {{1363,257},{35,14}} + {{1076,712},{35,14}} textureRotated - + ybg.png @@ -1860,7 +1800,7 @@ spriteSourceSize {216,14} textureRect - {{351,524},{216,14}} + {{213,944},{216,14}} textureRotated @@ -1876,9 +1816,9 @@ realTextureFileName gui.png size - {1546,982} + {1438,1018} smartupdate - $TexturePacker:SmartUpdate:78f6afe3d3703da4de84d82fe71684cf:ad194a0fee65d01752c98a7a01f1a98a:5f86533554b8a62fd9d2a17dd9533d7c$ + $TexturePacker:SmartUpdate:dbc5dc2306dcfd3473e2c2ed168b13e6:d0668428708ac8725885e3506398a37a:5f86533554b8a62fd9d2a17dd9533d7c$ textureFileName gui.png diff --git a/assets/resources/gui/gui.plist.meta b/assets/resources/gui/gui.plist.meta index f7afd38c..b57921df 100644 --- a/assets/resources/gui/gui.plist.meta +++ b/assets/resources/gui/gui.plist.meta @@ -19,8 +19,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 370, - "trimY": 550, + "trimX": 213, + "trimY": 970, "width": 180, "height": 38, "rawWidth": 180, @@ -154,11 +154,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 634, - "trimY": 524, + "trimX": 956, + "trimY": 425, "width": 49, "height": 42, "rawWidth": 49, @@ -203,8 +203,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 773, - "trimY": 209, + "trimX": 612, + "trimY": 686, "width": 160, "height": 160, "rawWidth": 160, @@ -249,8 +249,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1363, - "trimY": 443, + "trimX": 1053, + "trimY": 95, "width": 132, "height": 148, "rawWidth": 160, @@ -341,8 +341,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 549, - "trimY": 866, + "trimX": 1310, + "trimY": 543, "width": 109, "height": 108, "rawWidth": 109, @@ -384,11 +384,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 689, - "trimY": 645, + "trimX": 955, + "trimY": 197, "width": 94, "height": 118, "rawWidth": 94, @@ -433,8 +433,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 569, - "trimY": 524, + "trimX": 1347, + "trimY": 752, "width": 64, "height": 63, "rawWidth": 64, @@ -479,8 +479,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1426, - "trimY": 807, + "trimX": 1153, + "trimY": 955, "width": 64, "height": 62, "rawWidth": 64, @@ -525,8 +525,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 689, - "trimY": 526, + "trimX": 957, + "trimY": 479, "width": 103, "height": 117, "rawWidth": 103, @@ -614,11 +614,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1315, - "trimY": 531, + "trimX": 395, + "trimY": 970, "width": 44, "height": 42, "rawWidth": 44, @@ -660,11 +660,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1166, - "trimY": 792, + "trimX": 714, + "trimY": 280, "width": 97, "height": 96, "rawWidth": 97, @@ -709,8 +709,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 331, - "trimY": 806, + "trimX": 427, + "trimY": 916, "width": 20, "height": 20, "rawWidth": 20, @@ -801,8 +801,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 660, - "trimY": 881, + "trimX": 1331, + "trimY": 441, "width": 100, "height": 100, "rawWidth": 100, @@ -847,8 +847,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 924, - "trimY": 887, + "trimX": 1190, + "trimY": 712, "width": 82, "height": 94, "rawWidth": 82, @@ -936,11 +936,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1456, - "trimY": 577, + "trimX": 1331, + "trimY": 355, "width": 84, "height": 106, "rawWidth": 84, @@ -982,11 +982,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 924, - "trimY": 785, + "trimX": 1030, + "trimY": 728, "width": 100, "height": 121, "rawWidth": 100, @@ -1028,11 +1028,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 809, - "trimY": 767, + "trimX": 1076, + "trimY": 597, "width": 119, "height": 113, "rawWidth": 119, @@ -1077,8 +1077,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 809, - "trimY": 641, + "trimX": 914, + "trimY": 728, "width": 124, "height": 114, "rawWidth": 124, @@ -1123,8 +1123,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1047, - "trimY": 792, + "trimX": 94, + "trimY": 916, "width": 101, "height": 117, "rawWidth": 101, @@ -1157,144 +1157,6 @@ ], "subMetas": {} }, - "8acbb": { - "importer": "sprite-frame", - "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@8acbb", - "displayName": "", - "id": "8acbb", - "name": "95", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 288, - "trimY": 832, - "width": 97, - "height": 125, - "rawWidth": 97, - "rawHeight": 125, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "25b64": { - "importer": "sprite-frame", - "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@25b64", - "displayName": "", - "id": "25b64", - "name": "96", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 932, - "trimY": 456, - "width": 98, - "height": 125, - "rawWidth": 98, - "rawHeight": 125, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "e41fc": { - "importer": "sprite-frame", - "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@e41fc", - "displayName": "", - "id": "e41fc", - "name": "97", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 932, - "trimY": 556, - "width": 97, - "height": 125, - "rawWidth": 97, - "rawHeight": 125, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, "e25fa": { "importer": "sprite-frame", "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@e25fa", @@ -1307,8 +1169,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1315, - "trimY": 577, + "trimX": 816, + "trimY": 479, "width": 139, "height": 117, "rawWidth": 139, @@ -1350,11 +1212,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 935, - "trimY": 187, + "trimX": 911, + "trimY": 854, "width": 129, "height": 123, "rawWidth": 129, @@ -1396,11 +1258,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 387, - "trimY": 914, + "trimX": 1347, + "trimY": 95, "width": 140, "height": 38, "rawWidth": 160, @@ -1583,8 +1445,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1264, - "trimY": 906, + "trimX": 1219, + "trimY": 955, "width": 95, "height": 61, "rawWidth": 95, @@ -1859,8 +1721,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 549, - "trimY": 590, + "trimX": 816, + "trimY": 339, "width": 138, "height": 138, "rawWidth": 160, @@ -1905,8 +1767,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1219, - "trimY": 401, + "trimX": 802, + "trimY": 598, "width": 128, "height": 142, "rawWidth": 160, @@ -1951,8 +1813,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1055, - "trimY": 674, + "trimX": 1186, + "trimY": 479, "width": 120, "height": 116, "rawWidth": 160, @@ -1994,11 +1856,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1396, - "trimY": 1, + "trimX": 773, + "trimY": 47, "width": 142, "height": 148, "rawWidth": 160, @@ -2040,11 +1902,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1363, - "trimY": 307, + "trimX": 917, + "trimY": 47, "width": 148, "height": 134, "rawWidth": 160, @@ -2089,8 +1951,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1059, - "trimY": 532, + "trimX": 813, + "trimY": 197, "width": 140, "height": 140, "rawWidth": 160, @@ -2132,11 +1994,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 678, - "trimY": 378, + "trimX": 1051, + "trimY": 229, "width": 114, "height": 146, "rawWidth": 160, @@ -2181,8 +2043,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 794, - "trimY": 371, + "trimX": 678, + "trimY": 378, "width": 144, "height": 136, "rawWidth": 160, @@ -2227,8 +2089,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 794, - "trimY": 517, + "trimX": 1193, + "trimY": 355, "width": 136, "height": 122, "rawWidth": 160, @@ -2270,11 +2132,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 1, "offsetY": -3, - "trimX": 1201, - "trimY": 532, + "trimX": 1049, + "trimY": 345, "width": 112, "height": 142, "rawWidth": 160, @@ -2319,8 +2181,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1059, - "trimY": 416, + "trimX": 1199, + "trimY": 239, "width": 114, "height": 146, "rawWidth": 160, @@ -2362,11 +2224,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 685, - "trimY": 741, + "trimX": 771, + "trimY": 853, "width": 138, "height": 122, "rawWidth": 160, @@ -2411,8 +2273,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 935, - "trimY": 318, + "trimX": 1062, + "trimY": 459, "width": 122, "height": 136, "rawWidth": 160, @@ -2457,8 +2319,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 925, - "trimY": 655, + "trimX": 946, + "trimY": 598, "width": 128, "height": 128, "rawWidth": 160, @@ -2503,8 +2365,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 387, - "trimY": 590, + "trimX": 288, + "trimY": 592, "width": 160, "height": 160, "rawWidth": 160, @@ -2549,8 +2411,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 387, - "trimY": 752, + "trimX": 288, + "trimY": 754, "width": 160, "height": 160, "rawWidth": 160, @@ -2595,8 +2457,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 773, - "trimY": 47, + "trimX": 450, + "trimY": 524, "width": 160, "height": 160, "rawWidth": 160, @@ -2641,8 +2503,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1060, - "trimY": 95, + "trimX": 450, + "trimY": 686, "width": 160, "height": 160, "rawWidth": 160, @@ -2687,8 +2549,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1222, - "trimY": 95, + "trimX": 450, + "trimY": 848, "width": 160, "height": 160, "rawWidth": 160, @@ -2733,8 +2595,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1384, - "trimY": 145, + "trimX": 612, + "trimY": 524, "width": 160, "height": 160, "rawWidth": 160, @@ -2767,52 +2629,6 @@ ], "subMetas": {} }, - "10dd1": { - "importer": "sprite-frame", - "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@10dd1", - "displayName": "", - "id": "10dd1", - "name": "GuardIcon", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 1008, - "trimY": 895, - "width": 82, - "height": 91, - "rawWidth": 82, - "rawHeight": 91, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, "d3524": { "importer": "sprite-frame", "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@d3524", @@ -2825,8 +2641,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1428, - "trimY": 871, + "trimX": 1264, + "trimY": 886, "width": 41, "height": 48, "rawWidth": 41, @@ -2868,11 +2684,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1513, - "trimY": 475, + "trimX": 1190, + "trimY": 808, "width": 35, "height": 32, "rawWidth": 35, @@ -2914,11 +2730,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1361, - "trimY": 939, + "trimX": 1307, + "trimY": 886, "width": 42, "height": 43, "rawWidth": 42, @@ -3006,11 +2822,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 870, - "trimY": 888, + "trimX": 771, + "trimY": 977, "width": 72, "height": 40, "rawWidth": 72, @@ -3055,8 +2871,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 288, - "trimY": 592, + "trimX": 1396, + "trimY": 1, "width": 238, "height": 41, "rawWidth": 238, @@ -3098,11 +2914,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1535, - "trimY": 307, + "trimX": 612, + "trimY": 1007, "width": 105, "height": 10, "rawWidth": 105, @@ -3147,8 +2963,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1518, - "trimY": 685, + "trimX": 1421, + "trimY": 543, "width": 111, "height": 16, "rawWidth": 111, @@ -3190,11 +3006,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 935, - "trimY": 47, + "trimX": 774, + "trimY": 728, "width": 138, "height": 123, "rawWidth": 138, @@ -3282,11 +3098,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1405, - "trimY": 696, + "trimX": 1153, + "trimY": 842, "width": 111, "height": 109, "rawWidth": 111, @@ -3377,8 +3193,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1101, - "trimY": 895, + "trimX": 1274, + "trimY": 752, "width": 71, "height": 71, "rawWidth": 71, @@ -3423,8 +3239,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1264, - "trimY": 807, + "trimX": 1310, + "trimY": 653, "width": 97, "height": 97, "rawWidth": 97, @@ -3469,8 +3285,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1492, - "trimY": 807, + "trimX": 773, + "trimY": 197, "width": 38, "height": 38, "rawWidth": 38, @@ -3512,11 +3328,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1177, - "trimY": 676, + "trimX": 1197, + "trimY": 597, "width": 112, "height": 111, "rawWidth": 112, @@ -3558,11 +3374,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1291, - "trimY": 696, + "trimX": 1042, + "trimY": 851, "width": 112, "height": 109, "rawWidth": 112, @@ -3604,11 +3420,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1513, - "trimY": 307, + "trimX": 845, + "trimY": 979, "width": 166, "height": 20, "rawWidth": 166, @@ -3650,11 +3466,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 331, - "trimY": 592, + "trimX": 213, + "trimY": 916, "width": 212, "height": 26, "rawWidth": 212, @@ -3687,52 +3503,6 @@ ], "subMetas": {} }, - "4d393": { - "importer": "sprite-frame", - "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@4d393", - "displayName": "", - "id": "4d393", - "name": "hero_box", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 549, - "trimY": 730, - "width": 134, - "height": 134, - "rawWidth": 134, - "rawHeight": 134, - "borderTop": 29, - "borderBottom": 30, - "borderLeft": 34, - "borderRight": 33, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", - "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, "5304c": { "importer": "sprite-frame", "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5304c", @@ -3788,11 +3558,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 762, - "trimY": 888, + "trimX": 956, + "trimY": 317, "width": 106, "height": 91, "rawWidth": 106, @@ -3837,8 +3607,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 714, - "trimY": 280, + "trimX": 1, + "trimY": 950, "width": 67, "height": 53, "rawWidth": 67, @@ -3883,8 +3653,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1060, - "trimY": 257, + "trimX": 612, + "trimY": 848, "width": 157, "height": 157, "rawWidth": 157, @@ -3917,6 +3687,52 @@ ], "subMetas": {} }, + "3b51d": { + "importer": "sprite-frame", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@3b51d", + "displayName": "", + "id": "3b51d", + "name": "play_character_target", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1132, + "trimY": 712, + "width": 128, + "height": 56, + "rawWidth": 128, + "rawHeight": 56, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "dfad9": { "importer": "sprite-frame", "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@dfad9", @@ -3929,8 +3745,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 387, - "trimY": 954, + "trimX": 845, + "trimY": 1001, "width": 129, "height": 8, "rawWidth": 129, @@ -3975,8 +3791,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 359, - "trimY": 592, + "trimX": 774, + "trimY": 524, "width": 191, "height": 26, "rawWidth": 191, @@ -4021,8 +3837,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 351, - "trimY": 540, + "trimX": 213, + "trimY": 960, "width": 216, "height": 8, "rawWidth": 216, @@ -4113,8 +3929,8 @@ "rotated": false, "offsetX": 369, "offsetY": -236, - "trimX": 1219, - "trimY": 257, + "trimX": 1203, + "trimY": 95, "width": 142, "height": 142, "rawWidth": 1024, @@ -4156,11 +3972,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1264, - "trimY": 969, + "trimX": 802, + "trimY": 524, "width": 32, "height": 12, "rawWidth": 32, @@ -4202,11 +4018,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1363, - "trimY": 807, + "trimX": 370, + "trimY": 524, "width": 61, "height": 69, "rawWidth": 61, @@ -4251,8 +4067,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1513, - "trimY": 512, + "trimX": 1227, + "trimY": 808, "width": 32, "height": 32, "rawWidth": 32, @@ -4343,8 +4159,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 94, - "trimY": 892, + "trimX": 1329, + "trimY": 825, "width": 30, "height": 32, "rawWidth": 32, @@ -4389,8 +4205,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1492, - "trimY": 847, + "trimX": 56, + "trimY": 950, "width": 32, "height": 32, "rawWidth": 32, @@ -4435,8 +4251,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1406, - "trimY": 939, + "trimX": 773, + "trimY": 237, "width": 32, "height": 32, "rawWidth": 32, @@ -4481,8 +4297,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1471, - "trimY": 881, + "trimX": 1007, + "trimY": 425, "width": 32, "height": 32, "rawWidth": 32, @@ -4527,8 +4343,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1505, - "trimY": 881, + "trimX": 56, + "trimY": 984, "width": 32, "height": 32, "rawWidth": 32, @@ -4573,8 +4389,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1440, - "trimY": 921, + "trimX": 1274, + "trimY": 711, "width": 32, "height": 32, "rawWidth": 32, @@ -4619,8 +4435,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1474, - "trimY": 915, + "trimX": 1361, + "trimY": 818, "width": 32, "height": 32, "rawWidth": 32, @@ -4665,8 +4481,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1474, - "trimY": 949, + "trimX": 1013, + "trimY": 979, "width": 32, "height": 32, "rawWidth": 32, @@ -4711,8 +4527,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1508, - "trimY": 915, + "trimX": 1047, + "trimY": 965, "width": 32, "height": 32, "rawWidth": 32, @@ -4754,11 +4570,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 950, + "trimX": 1395, + "trimY": 818, "width": 30, "height": 32, "rawWidth": 32, @@ -4803,8 +4619,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 35, - "trimY": 950, + "trimX": 1361, + "trimY": 852, "width": 30, "height": 32, "rawWidth": 32, @@ -4846,11 +4662,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1174, - "trimY": 891, + "trimX": 1347, + "trimY": 241, "width": 90, "height": 88, "rawWidth": 96, @@ -4892,11 +4708,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 69, - "trimY": 950, + "trimX": 1395, + "trimY": 852, "width": 30, "height": 32, "rawWidth": 32, @@ -4941,8 +4757,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1508, - "trimY": 949, + "trimX": 1081, + "trimY": 965, "width": 32, "height": 32, "rawWidth": 32, @@ -4987,8 +4803,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 126, - "trimY": 916, + "trimX": 1115, + "trimY": 965, "width": 32, "height": 32, "rawWidth": 32, @@ -5033,8 +4849,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 160, - "trimY": 916, + "trimX": 1316, + "trimY": 931, "width": 32, "height": 32, "rawWidth": 32, @@ -5079,8 +4895,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 103, - "trimY": 950, + "trimX": 1385, + "trimY": 886, "width": 30, "height": 32, "rawWidth": 32, @@ -5125,8 +4941,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 194, - "trimY": 916, + "trimX": 1316, + "trimY": 965, "width": 32, "height": 32, "rawWidth": 32, @@ -5171,8 +4987,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 137, - "trimY": 950, + "trimX": 1351, + "trimY": 918, "width": 30, "height": 32, "rawWidth": 32, @@ -5217,8 +5033,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 228, - "trimY": 916, + "trimX": 1351, + "trimY": 884, "width": 32, "height": 32, "rawWidth": 32, @@ -5263,8 +5079,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 695, - "trimY": 49, + "trimX": 1350, + "trimY": 950, "width": 32, "height": 32, "rawWidth": 32, @@ -5309,8 +5125,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 695, - "trimY": 83, + "trimX": 1385, + "trimY": 918, "width": 32, "height": 32, "rawWidth": 32, @@ -5355,8 +5171,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 695, - "trimY": 117, + "trimX": 1384, + "trimY": 952, "width": 32, "height": 32, "rawWidth": 32, @@ -5401,8 +5217,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 729, - "trimY": 47, + "trimX": 1350, + "trimY": 984, "width": 32, "height": 32, "rawWidth": 32, @@ -5447,8 +5263,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 171, - "trimY": 950, + "trimX": 1384, + "trimY": 986, "width": 30, "height": 32, "rawWidth": 32, @@ -5493,8 +5309,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 729, - "trimY": 81, + "trimX": 695, + "trimY": 49, "width": 32, "height": 32, "rawWidth": 32, @@ -5539,8 +5355,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 729, - "trimY": 115, + "trimX": 695, + "trimY": 83, "width": 32, "height": 32, "rawWidth": 32, @@ -5585,8 +5401,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1363, - "trimY": 878, + "trimX": 1264, + "trimY": 825, "width": 63, "height": 59, "rawWidth": 63, @@ -5628,11 +5444,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1363, - "trimY": 257, + "trimX": 1076, + "trimY": 712, "width": 35, "height": 14, "rawWidth": 35, @@ -5677,8 +5493,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 351, - "trimY": 524, + "trimX": 213, + "trimY": 944, "width": 216, "height": 14, "rawWidth": 216, diff --git a/assets/resources/gui/gui.png b/assets/resources/gui/gui.png index ade724b2..96cf4430 100644 Binary files a/assets/resources/gui/gui.png and b/assets/resources/gui/gui.png differ diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index 9a8e5f9f..78b1ed6c 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -55,20 +55,20 @@ export class SingletonModuleComp extends ecs.Comp { monsters_dead:any = [] heros_dead:any = [] hero_pos:any=[ - {x:-320,y:70}, - {x:-320,y:0}, - {x:-320,y:-70}, - {x:-320,y:0}, - {x:-320,y:0}, - {x:-320,y:0}, + {x:-320,y:BoxSet.GAME_LINE+70}, + {x:-320,y:BoxSet.GAME_LINE}, + {x:-320,y:BoxSet.GAME_LINE-70}, + {x:-320,y:BoxSet.GAME_LINE}, + {x:-320,y:BoxSet.GAME_LINE}, + {x:-320,y:BoxSet.GAME_LINE}, ] enemy_pos:any =[ - {x:320,y:70}, - {x:320,y:0}, - {x:320,y:-70}, - {x:320,y:0}, - {x:320,y:0}, - {x:320,y:0}, + {x:320,y:BoxSet.GAME_LINE+70}, + {x:320,y:BoxSet.GAME_LINE}, + {x:320,y:BoxSet.GAME_LINE-70}, + {x:320,y:BoxSet.GAME_LINE}, + {x:320,y:BoxSet.GAME_LINE}, + {x:320,y:BoxSet.GAME_LINE}, ] vm_data: any = { name : "纸片精灵大乱斗", diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index d2e2123a..95aaa7ad 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -197,7 +197,7 @@ export class HeroViewComp extends CCComp { if(this.stop_cd > 0){ return } - if (this.node.position.x >= 250-this.atk_dis) { + if (this.node.position.x >= 250-this.atk_dis/2) { return; } // if(this.enemy){ @@ -244,16 +244,14 @@ export class HeroViewComp extends CCComp { let pos =this.skill_pos() let t_pos:Vec3 = v3(720,0) if(this.enemy){ - t_pos = v3(this.enemy.x-this.node.position.x,this.enemy.y-(this.node.position.y+pos.y)) + t_pos = v3(this.enemy.x-this.node.position.x,this.enemy.y-this.node.position.y) } - console.log("get_hero_pos",this.enemy,this.node.position,t_pos); return {pos,t_pos} } get_hero_pos(hero:any){ let pos =this.skill_pos() let t_pos:Vec3 = v3(720,0) if(!hero.HeroView.node.isValid){ - console.log("hero.heroView.node.isValid",hero.HeroView); return }else{ t_pos = v3(hero.HeroView.node.position.x-this.node.position.x,hero.HeroView.node.position.y-(this.node.position.y+pos.y)) @@ -443,7 +441,7 @@ export class HeroViewComp extends CCComp { this.scheduleOnce(() => { this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0); }, 0.3); - console.log(this.buff_atks) + // console.log(this.buff_atks) } check_buff_atks(dt: number){ diff --git a/assets/script/game/map/MapMonsterComp.ts b/assets/script/game/map/MapMonsterComp.ts index 81e66c42..adecc717 100644 --- a/assets/script/game/map/MapMonsterComp.ts +++ b/assets/script/game/map/MapMonsterComp.ts @@ -40,7 +40,6 @@ export class MapMonsterComp extends CCComp { hero_start_ys:any[] = [35,-35]; mon_index:number = 0 hero_index:number = 0 - line:number=BoxSet.GAME_LINE onLoad(){ // 监听全局事件 oops.message.on("other_add_monster", this.on_other_add_monster, this); @@ -94,15 +93,15 @@ export class MapMonsterComp extends CCComp { for(let i=0;i x&&ho.y == (this.line +70)){ + if(ho.x > x&&ho.y == smc.hero_pos[0].y){ x = ho.x continue } - if(ho.x > x1&&ho.y == this.line ){ + if(ho.x > x1&&ho.y == smc.hero_pos[1].y ){ x1 = ho.x continue } - if(ho.x > x2&&ho.y == (this.line -70)){ + if(ho.x > x2&&ho.y == smc.hero_pos[2].y){ x2 = ho.x continue } @@ -150,7 +149,7 @@ export class MapMonsterComp extends CCComp { private addHero(uuid:number=1001) { let hero = ecs.getEntity(Hero); var scene = smc.map.MapView.scene; - let pos:Vec3 = v3(-280,BoxSet.GAME_LINE+this.start_ys[2]); + let pos:Vec3 = v3(-280,BoxSet.GAME_LINE+this.start_ys[this.hero_index]); let monster_layer = scene.entityLayer!.node! let scale = 1 hero.load(pos,scale,uuid,monster_layer);