diff --git a/assets/resources/common/prefab/notify.prefab b/assets/resources/common/prefab/notify.prefab index 7720eb32..982c0c3f 100644 --- a/assets/resources/common/prefab/notify.prefab +++ b/assets/resources/common/prefab/notify.prefab @@ -20,30 +20,33 @@ "_children": [ { "__id__": 2 + }, + { + "__id__": 8 } ], "_active": true, "_components": [ - { - "__id__": 10 - }, - { - "__id__": 12 - }, - { - "__id__": 14 - }, { "__id__": 16 + }, + { + "__id__": 18 + }, + { + "__id__": 20 + }, + { + "__id__": 22 } ], "_prefab": { - "__id__": 18 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -300, + "y": 0, "z": 0 }, "_lrot": { @@ -71,7 +74,7 @@ }, { "__type__": "cc.Node", - "_name": "lab_content", + "_name": "ToastMessage_Bg_Gray", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -85,18 +88,15 @@ }, { "__id__": 5 - }, - { - "__id__": 7 } ], "_prefab": { - "__id__": 9 + "__id__": 7 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -139.918, "z": 0 }, "_lrot": { @@ -136,8 +136,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 131.2109375, - "height": 50.4 + "width": 800, + "height": 60 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -148,10 +148,10 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "99X9v0jUlJNZIh0XrXacci" + "fileId": "daWGVMfiBINaoHLXMFGxnx" }, { - "__type__": "cc.Label", + "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "__editorExtras__": {}, @@ -165,6 +165,145 @@ "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 175 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@85c63", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3fUgziN35AapBo1Cf9UAoy" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "249lHuvrpOfrKXv35DvZQA", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "lab_content", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 11 + }, + { + "__id__": 13 + } + ], + "_prefab": { + "__id__": 15 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -139.918, + "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": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 98.408203125, + "height": 37.8 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "99X9v0jUlJNZIh0XrXacci" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", "r": 255, @@ -175,10 +314,10 @@ "_string": "content", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, + "_actualFontSize": 30, + "_fontSize": 30, "_fontFamily": "Arial", - "_lineHeight": 40, + "_lineHeight": 30, "_overflow": 0, "_enableWrapText": true, "_font": null, @@ -224,11 +363,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 8 + "__id__": 14 }, "_params": [], "_dataID": "", @@ -261,7 +400,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", @@ -289,7 +428,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 19 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -299,7 +438,7 @@ "r": 255, "g": 255, "b": 255, - "a": 255 + "a": 155 }, "_spriteFrame": null, "_type": 1, @@ -331,7 +470,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 21 }, "playOnLoad": true, "_clips": [ @@ -360,13 +499,13 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 23 }, "lab_content": { - "__id__": 5 + "__id__": 11 }, "animation": { - "__id__": 14 + "__id__": 20 }, "_id": "" }, diff --git a/assets/resources/gui/gui.plist b/assets/resources/gui/gui.plist index 0cdf98a3..6953f83c 100644 --- a/assets/resources/gui/gui.plist +++ b/assets/resources/gui/gui.plist @@ -15,9 +15,9 @@ spriteSourceSize {94,118} textureRect - {{1288,626},{94,118}} + {{1081,652},{94,118}} textureRotated - + 02.png @@ -30,9 +30,9 @@ spriteSourceSize {64,63} textureRect - {{570,1342},{64,63}} + {{1697,1420},{64,63}} textureRotated - + 100.png @@ -45,7 +45,7 @@ spriteSourceSize {103,117} textureRect - {{1665,412},{103,117}} + {{1528,836},{103,117}} textureRotated @@ -60,7 +60,7 @@ spriteSourceSize {144,179} textureRect - {{543,49},{144,179}} + {{391,423},{144,179}} textureRotated @@ -75,7 +75,7 @@ spriteSourceSize {44,42} textureRect - {{410,1163},{44,42}} + {{1605,670},{44,42}} textureRotated @@ -90,9 +90,9 @@ spriteSourceSize {97,96} textureRect - {{1169,1308},{97,96}} + {{845,732},{97,96}} textureRotated - + 129.png @@ -105,7 +105,7 @@ spriteSourceSize {20,20} textureRect - {{1319,430},{20,20}} + {{151,1454},{20,20}} textureRotated @@ -120,9 +120,9 @@ spriteSourceSize {122,98} textureRect - {{377,1001},{122,98}} + {{1443,590},{122,98}} textureRotated - + 43.png @@ -135,7 +135,7 @@ spriteSourceSize {100,100} textureRect - {{1369,1305},{100,100}} + {{1383,1193},{100,100}} textureRotated @@ -150,9 +150,9 @@ spriteSourceSize {82,94} textureRect - {{1438,1200},{82,94}} + {{1140,1290},{82,94}} textureRotated - + 58.png @@ -165,9 +165,9 @@ spriteSourceSize {100,96} textureRect - {{1267,1308},{100,96}} + {{318,1084},{100,96}} textureRotated - + 67.png @@ -180,7 +180,7 @@ spriteSourceSize {84,106} textureRect - {{1330,1219},{84,106}} + {{915,1217},{84,106}} textureRotated @@ -195,7 +195,7 @@ spriteSourceSize {100,121} textureRect - {{1440,184},{100,121}} + {{1255,1070},{100,121}} textureRotated @@ -210,7 +210,7 @@ spriteSourceSize {119,113} textureRect - {{1279,876},{119,113}} + {{1204,748},{119,113}} textureRotated @@ -225,7 +225,7 @@ spriteSourceSize {124,114} textureRect - {{1319,304},{124,114}} + {{907,961},{124,114}} textureRotated @@ -240,7 +240,7 @@ spriteSourceSize {160,48} textureRect - {{1301,484},{140,38}} + {{737,992},{140,38}} textureRotated @@ -255,9 +255,9 @@ spriteSourceSize {389,124} textureRect - {{1,1111},{365,100}} + {{964,1},{365,100}} textureRotated - + AttackSpeedICon.png @@ -270,9 +270,9 @@ spriteSourceSize {95,61} textureRect - {{635,1345},{95,61}} + {{1629,1082},{95,61}} textureRotated - + BubbleFrame01_Hexagon_Bg_Blue.png @@ -285,7 +285,7 @@ spriteSourceSize {250,243} textureRect - {{1,376},{250,243}} + {{422,146},{250,243}} textureRotated @@ -300,7 +300,7 @@ spriteSourceSize {250,243} textureRect - {{1,621},{250,243}} + {{49,587},{250,243}} textureRotated @@ -315,7 +315,7 @@ spriteSourceSize {250,243} textureRect - {{1,866},{250,243}} + {{674,146},{250,243}} textureRotated @@ -330,9 +330,9 @@ spriteSourceSize {70,114} textureRect - {{937,955},{70,114}} + {{1236,1295},{70,114}} textureRotated - + Button01_s_Gray.png @@ -345,9 +345,9 @@ spriteSourceSize {70,114} textureRect - {{810,1229},{70,114}} + {{1352,1295},{70,114}} textureRotated - + Button01_s_Mint.png @@ -360,9 +360,9 @@ spriteSourceSize {70,114} textureRect - {{882,1229},{70,114}} + {{1468,1421},{70,114}} textureRotated - + Button01_s_Red.png @@ -375,9 +375,9 @@ spriteSourceSize {70,114} textureRect - {{1012,1407},{70,114}} + {{1412,954},{70,114}} textureRotated - + Button01_s_Sky.png @@ -390,9 +390,9 @@ spriteSourceSize {70,114} textureRect - {{1462,1407},{70,114}} + {{1692,1102},{70,114}} textureRotated - + Button01_s_White_Bg.png @@ -405,7 +405,7 @@ spriteSourceSize {70,114} textureRect - {{1512,980},{70,114}} + {{1808,1105},{70,114}} textureRotated @@ -420,7 +420,7 @@ spriteSourceSize {70,114} textureRect - {{1962,1087},{70,114}} + {{1614,1295},{70,114}} textureRotated @@ -435,7 +435,7 @@ spriteSourceSize {128,107} textureRect - {{1019,859},{128,107}} + {{1074,748},{128,107}} textureRotated @@ -450,9 +450,9 @@ spriteSourceSize {128,107} textureRect - {{1149,874},{128,107}} + {{1325,704},{128,107}} textureRotated - + Button_SkillBtn_Orange.png @@ -465,7 +465,7 @@ spriteSourceSize {128,107} textureRect - {{1009,968},{128,107}} + {{1023,961},{128,107}} textureRotated @@ -480,7 +480,7 @@ spriteSourceSize {128,107} textureRect - {{1139,983},{128,107}} + {{1153,961},{128,107}} textureRotated @@ -495,7 +495,7 @@ spriteSourceSize {160,160} textureRect - {{530,564},{160,160}} + {{715,570},{160,160}} textureRotated @@ -510,7 +510,7 @@ spriteSourceSize {160,160} textureRect - {{501,726},{160,160}} + {{1327,104},{160,160}} textureRotated @@ -525,9 +525,9 @@ spriteSourceSize {102,118} textureRect - {{1770,630},{102,118}} + {{1135,1186},{102,118}} textureRotated - + CardFrame06_White_Frame.png @@ -540,9 +540,9 @@ spriteSourceSize {102,118} textureRect - {{1874,719},{102,118}} + {{1544,714},{102,118}} textureRotated - + Cartoon RPG UI_Button Text - Gray.png @@ -555,9 +555,9 @@ spriteSourceSize {320,160} textureRect - {{253,728},{320,122}} + {{1683,1},{320,122}} textureRotated - + Cartoon RPG UI_Button Text - Green.png @@ -570,7 +570,7 @@ spriteSourceSize {320,160} textureRect - {{377,679},{320,122}} + {{194,832},{320,122}} textureRotated @@ -585,9 +585,9 @@ spriteSourceSize {320,160} textureRect - {{1060,1},{320,122}} + {{192,1154},{320,122}} textureRotated - + Cartoon RPG UI_Game Icon - Attack.png @@ -600,7 +600,7 @@ spriteSourceSize {160,160} textureRect - {{914,47},{144,144}} + {{572,423},{144,144}} textureRotated @@ -615,7 +615,7 @@ spriteSourceSize {160,160} textureRect - {{914,193},{128,142}} + {{1683,125},{128,142}} textureRotated @@ -630,9 +630,9 @@ spriteSourceSize {160,160} textureRect - {{248,1408},{120,116}} + {{1561,94},{120,116}} textureRotated - + Cartoon RPG UI_Game Icon - Defense.png @@ -645,7 +645,7 @@ spriteSourceSize {160,160} textureRect - {{1879,1},{142,148}} + {{1,1464},{142,148}} textureRotated @@ -660,7 +660,7 @@ spriteSourceSize {160,160} textureRect - {{913,323},{140,140}} + {{595,992},{140,140}} textureRotated @@ -675,9 +675,9 @@ spriteSourceSize {160,160} textureRect - {{662,1229},{114,146}} + {{640,1134},{114,146}} textureRotated - + Cartoon RPG UI_Game Icon - Life.png @@ -690,9 +690,9 @@ spriteSourceSize {160,160} textureRect - {{410,1212},{144,136}} + {{754,830},{144,136}} textureRotated - + Cartoon RPG UI_Game Icon - Magic Resistant Gem.png @@ -705,7 +705,7 @@ spriteSourceSize {160,160} textureRect - {{899,465},{136,122}} + {{1830,249},{136,122}} textureRotated @@ -720,7 +720,7 @@ spriteSourceSize {160,160} textureRect - {{1202,200},{112,142}} + {{685,1464},{112,142}} textureRotated @@ -735,9 +735,9 @@ spriteSourceSize {160,160} textureRect - {{1195,344},{138,122}} + {{1827,125},{138,122}} textureRotated - + Cartoon RPG UI_Game Icon - Water Gem.png @@ -750,7 +750,7 @@ spriteSourceSize {160,160} textureRect - {{253,1050},{122,136}} + {{930,390},{122,136}} textureRotated @@ -765,7 +765,7 @@ spriteSourceSize {160,160} textureRect - {{1151,744},{128,128}} + {{944,717},{128,128}} textureRotated @@ -780,7 +780,7 @@ spriteSourceSize {160,160} textureRect - {{692,584},{160,160}} + {{1327,266},{160,160}} textureRotated @@ -795,7 +795,7 @@ spriteSourceSize {160,160} textureRect - {{501,888},{160,160}} + {{316,1186},{160,160}} textureRotated @@ -810,7 +810,7 @@ spriteSourceSize {160,160} textureRect - {{663,746},{160,160}} + {{478,1139},{160,160}} textureRotated @@ -825,7 +825,7 @@ spriteSourceSize {160,160} textureRect - {{663,908},{160,160}} + {{1161,332},{160,160}} textureRotated @@ -840,7 +840,7 @@ spriteSourceSize {160,160} textureRect - {{248,1188},{160,160}} + {{1323,428},{160,160}} textureRotated @@ -855,7 +855,7 @@ spriteSourceSize {160,160} textureRect - {{501,1050},{160,160}} + {{538,1301},{160,160}} textureRotated @@ -870,7 +870,7 @@ spriteSourceSize {360,200} textureRect - {{1,194},{340,180}} + {{49,405},{340,180}} textureRotated @@ -885,7 +885,7 @@ spriteSourceSize {41,48} textureRect - {{1320,125},{41,48}} + {{416,1139},{41,48}} textureRotated @@ -900,9 +900,9 @@ spriteSourceSize {60,122} textureRect - {{377,1101},{60,122}} + {{1967,125},{60,122}} textureRotated - + ItemFrame01_Single_Gray.png @@ -915,7 +915,7 @@ spriteSourceSize {60,122} textureRect - {{1967,145},{60,122}} + {{1968,249},{60,122}} textureRotated @@ -930,9 +930,9 @@ spriteSourceSize {60,122} textureRect - {{1872,357},{60,122}} + {{1829,373},{60,122}} textureRotated - + ItemFrame01_Single_OffWhite.png @@ -945,7 +945,7 @@ spriteSourceSize {60,122} textureRect - {{1872,481},{60,122}} + {{1543,590},{60,122}} textureRotated @@ -960,9 +960,9 @@ spriteSourceSize {60,122} textureRect - {{1874,823},{60,122}} + {{1633,834},{60,122}} textureRotated - + ItemFrame01_Single_Red.png @@ -975,9 +975,9 @@ spriteSourceSize {60,122} textureRect - {{803,1345},{60,122}} + {{1630,958},{60,122}} textureRotated - + ItemFrame01_Single_Yellow.png @@ -990,7 +990,7 @@ spriteSourceSize {60,122} textureRect - {{1288,1406},{60,122}} + {{1552,1295},{60,122}} textureRotated @@ -1005,9 +1005,9 @@ spriteSourceSize {60,62} textureRect - {{1607,1415},{60,62}} + {{1953,373},{60,62}} textureRotated - + ItemFrame02_Single_Gray.png @@ -1020,7 +1020,7 @@ spriteSourceSize {60,62} textureRect - {{1705,1295},{60,62}} + {{1777,1285},{60,62}} textureRotated @@ -1035,7 +1035,7 @@ spriteSourceSize {60,62} textureRect - {{1767,1289},{60,62}} + {{1839,1285},{60,62}} textureRotated @@ -1050,9 +1050,9 @@ spriteSourceSize {60,62} textureRect - {{1687,1359},{60,62}} + {{1901,1285},{60,62}} textureRotated - + ItemFrame02_Single_OffWhite.png @@ -1065,7 +1065,7 @@ spriteSourceSize {60,62} textureRect - {{1669,1421},{60,62}} + {{1963,1288},{60,62}} textureRotated @@ -1080,9 +1080,9 @@ spriteSourceSize {60,62} textureRect - {{1733,1421},{60,62}} + {{1777,1349},{60,62}} textureRotated - + ItemFrame02_Single_Red.png @@ -1095,7 +1095,7 @@ spriteSourceSize {60,62} textureRect - {{1751,1359},{60,62}} + {{1841,1349},{60,62}} textureRotated @@ -1110,9 +1110,9 @@ spriteSourceSize {60,62} textureRect - {{1795,1421},{60,62}} + {{1963,1350},{60,62}} textureRotated - + ItemFrame03_Single_Blue.png @@ -1125,7 +1125,7 @@ spriteSourceSize {128,130} textureRect - {{894,589},{128,130}} + {{151,1476},{128,130}} textureRotated @@ -1140,9 +1140,9 @@ spriteSourceSize {128,130} textureRect - {{1037,469},{128,130}} + {{281,1476},{128,130}} textureRotated - + ItemFrame03_Single_Green.png @@ -1155,9 +1155,9 @@ spriteSourceSize {128,130} textureRect - {{1024,599},{128,130}} + {{411,1476},{128,130}} textureRotated - + ItemFrame03_Single_Navy.png @@ -1170,9 +1170,9 @@ spriteSourceSize {128,130} textureRect - {{1169,484},{128,130}} + {{777,976},{128,130}} textureRotated - + ItemFrame03_Single_Red.png @@ -1185,9 +1185,9 @@ spriteSourceSize {128,130} textureRect - {{1156,614},{128,130}} + {{934,528},{128,130}} textureRotated - + ItemFrame03_Single_Yellow.png @@ -1200,9 +1200,9 @@ spriteSourceSize {128,130} textureRect - {{1019,729},{128,130}} + {{1064,520},{128,130}} textureRotated - + ItemIcon_Badge_Crown.Png @@ -1215,7 +1215,7 @@ spriteSourceSize {128,128} textureRect - {{1852,1087},{108,108}} + {{1695,890},{108,108}} textureRotated @@ -1230,9 +1230,9 @@ spriteSourceSize {128,128} textureRect - {{1435,307},{124,112}} + {{1317,590},{124,112}} textureRotated - + ItemIcon_Bag_Brown.Png @@ -1245,7 +1245,7 @@ spriteSourceSize {128,128} textureRect - {{825,964},{110,104}} + {{1023,1196},{110,104}} textureRotated @@ -1260,7 +1260,7 @@ spriteSourceSize {128,128} textureRect - {{1744,980},{110,104}} + {{1489,322},{110,104}} textureRotated @@ -1275,9 +1275,9 @@ spriteSourceSize {128,128} textureRect - {{1123,1092},{128,100}} + {{813,1108},{128,100}} textureRotated - + ItemIcon_Book_1_Purple.Png @@ -1290,7 +1290,7 @@ spriteSourceSize {128,128} textureRect - {{1084,1407},{100,114}} + {{1528,955},{100,114}} textureRotated @@ -1305,9 +1305,9 @@ spriteSourceSize {128,128} textureRect - {{1186,1407},{100,114}} + {{1692,1000},{100,114}} textureRotated - + ItemIcon_Calendar.Png @@ -1320,9 +1320,9 @@ spriteSourceSize {128,128} textureRect - {{1856,985},{100,110}} + {{1527,1071},{100,110}} textureRotated - + ItemIcon_Calendar_Check.Png @@ -1335,7 +1335,7 @@ spriteSourceSize {128,128} textureRect - {{1400,986},{100,110}} + {{1924,1079},{100,110}} textureRotated @@ -1350,7 +1350,7 @@ spriteSourceSize {128,128} textureRect - {{954,1299},{114,106}} + {{1927,435},{114,106}} textureRotated @@ -1365,7 +1365,7 @@ spriteSourceSize {128,128} textureRect - {{901,849},{116,104}} + {{1168,1502},{116,104}} textureRotated @@ -1380,9 +1380,9 @@ spriteSourceSize {128,128} textureRect - {{1934,483},{120,98}} + {{1561,212},{120,98}} textureRotated - + ItemIcon_Chest_Premium.Png @@ -1395,9 +1395,9 @@ spriteSourceSize {128,128} textureRect - {{1426,544},{124,100}} + {{1366,1367},{124,100}} textureRotated - + ItemIcon_Chest_Skull.png @@ -1410,9 +1410,9 @@ spriteSourceSize {128,128} textureRect - {{993,1191},{128,106}} + {{915,1087},{128,106}} textureRotated - + ItemIcon_Chest_Wood.Png @@ -1425,7 +1425,7 @@ spriteSourceSize {128,128} textureRect - {{1934,359},{122,98}} + {{1605,546},{122,98}} textureRotated @@ -1440,9 +1440,9 @@ spriteSourceSize {128,128} textureRect - {{1719,111},{114,116}} + {{1412,836},{114,116}} textureRotated - + ItemIcon_Clover_Green.Png @@ -1455,9 +1455,9 @@ spriteSourceSize {128,128} textureRect - {{1549,284},{114,116}} + {{1601,312},{114,116}} textureRotated - + ItemIcon_Dungeon.Png @@ -1470,9 +1470,9 @@ spriteSourceSize {128,128} textureRect - {{586,1408},{118,100}} + {{1923,647},{118,100}} textureRotated - + ItemIcon_Earth.Png @@ -1485,9 +1485,9 @@ spriteSourceSize {128,128} textureRect - {{476,1408},{120,108}} + {{1805,435},{120,108}} textureRotated - + ItemIcon_Friend.Png @@ -1500,9 +1500,9 @@ spriteSourceSize {128,128} textureRect - {{1281,746},{128,102}} + {{1022,857},{128,102}} textureRotated - + ItemIcon_Gear.Png @@ -1515,7 +1515,7 @@ spriteSourceSize {128,128} textureRect - {{1400,860},{110,124}} + {{1023,1070},{110,124}} textureRotated @@ -1530,7 +1530,7 @@ spriteSourceSize {128,128} textureRect - {{1599,111},{118,114}} + {{1135,1070},{118,114}} textureRotated @@ -1545,9 +1545,9 @@ spriteSourceSize {128,128} textureRect - {{1385,744},{122,114}} + {{1201,624},{122,114}} textureRotated - + ItemIcon_Gear_Hat_Witch.Png @@ -1560,9 +1560,9 @@ spriteSourceSize {128,128} textureRect - {{993,1077},{128,112}} + {{1194,494},{128,112}} textureRotated - + ItemIcon_Gear_Ring.Png @@ -1575,7 +1575,7 @@ spriteSourceSize {128,128} textureRect - {{1628,1187},{108,106}} + {{1807,1177},{108,106}} textureRotated @@ -1590,7 +1590,7 @@ spriteSourceSize {128,128} textureRect - {{1350,1407},{110,110}} + {{1415,1026},{110,110}} textureRotated @@ -1605,9 +1605,9 @@ spriteSourceSize {128,128} textureRect - {{1862,885},{116,98}} + {{1705,544},{116,98}} textureRotated - + ItemIcon_Gem_Ellipse_Red.Png @@ -1620,9 +1620,9 @@ spriteSourceSize {128,128} textureRect - {{1341,430},{92,112}} + {{964,1513},{92,112}} textureRotated - + ItemIcon_Gift_Blue.Png @@ -1635,7 +1635,7 @@ spriteSourceSize {128,128} textureRect - {{1412,1088},{110,108}} + {{1695,778},{110,108}} textureRotated @@ -1650,7 +1650,7 @@ spriteSourceSize {128,128} textureRect - {{1628,1077},{110,108}} + {{1808,995},{110,108}} textureRotated @@ -1665,9 +1665,9 @@ spriteSourceSize {128,128} textureRect - {{1740,1086},{110,108}} + {{1485,1183},{110,108}} textureRotated - + ItemIcon_Heart_Dimmed.Png @@ -1680,9 +1680,9 @@ spriteSourceSize {128,128} textureRect - {{1628,977},{114,98}} + {{1705,662},{114,98}} textureRotated - + ItemIcon_Key_Gold.png @@ -1695,7 +1695,7 @@ spriteSourceSize {128,128} textureRect - {{1549,402},{114,116}} + {{1569,428},{114,116}} textureRotated @@ -1710,9 +1710,9 @@ spriteSourceSize {128,128} textureRect - {{688,1408},{118,100}} + {{1923,749},{118,100}} textureRotated - + ItemIcon_Map.Png @@ -1725,9 +1725,9 @@ spriteSourceSize {128,128} textureRect - {{1509,750},{116,108}} + {{1719,312},{116,108}} textureRotated - + ItemIcon_Meat.Png @@ -1740,9 +1740,9 @@ spriteSourceSize {128,128} textureRect - {{1316,184},{122,118}} + {{595,709},{122,118}} textureRotated - + ItemIcon_Medal_Bronze_1.png @@ -1755,9 +1755,9 @@ spriteSourceSize {128,128} textureRect - {{1665,284},{100,126}} + {{1283,961},{100,126}} textureRotated - + ItemIcon_Medal_Bronze_2.png @@ -1770,7 +1770,7 @@ spriteSourceSize {128,128} textureRect - {{1514,648},{100,126}} + {{1255,1193},{100,126}} textureRotated @@ -1785,9 +1785,9 @@ spriteSourceSize {128,128} textureRect - {{1642,649},{100,126}} + {{958,1385},{100,126}} textureRotated - + ItemIcon_Medal_Gold_2.png @@ -1800,9 +1800,9 @@ spriteSourceSize {128,128} textureRect - {{1627,751},{100,126}} + {{1060,1385},{100,126}} textureRotated - + ItemIcon_Medal_Silver_1.png @@ -1815,7 +1815,7 @@ spriteSourceSize {128,128} textureRect - {{1770,374},{100,126}} + {{1162,1374},{100,126}} textureRotated @@ -1830,7 +1830,7 @@ spriteSourceSize {128,128} textureRect - {{1770,502},{100,126}} + {{1264,1367},{100,126}} textureRotated @@ -1845,7 +1845,7 @@ spriteSourceSize {128,128} textureRect - {{556,1212},{128,104}} + {{1054,390},{128,104}} textureRotated @@ -1860,9 +1860,9 @@ spriteSourceSize {128,128} textureRect - {{1770,750},{102,114}} + {{1927,543},{102,114}} textureRotated - + ItemIcon_Money_Bill.Png @@ -1875,7 +1875,7 @@ spriteSourceSize {128,128} textureRect - {{366,1408},{108,120}} + {{1434,714},{108,120}} textureRotated @@ -1890,7 +1890,7 @@ spriteSourceSize {128,128} textureRect - {{1123,1194},{128,112}} + {{892,847},{128,112}} textureRotated @@ -1905,9 +1905,9 @@ spriteSourceSize {128,128} textureRect - {{790,1408},{116,106}} + {{1805,659},{116,106}} textureRotated - + ItemIcon_Skull.png @@ -1920,7 +1920,7 @@ spriteSourceSize {128,128} textureRect - {{1552,520},{126,102}} + {{434,1348},{126,102}} textureRotated @@ -1935,9 +1935,9 @@ spriteSourceSize {128,128} textureRect - {{1656,531},{116,112}} + {{1508,1493},{116,112}} textureRotated - + ItemIcon_Star_Bronze.Png @@ -1950,7 +1950,7 @@ spriteSourceSize {128,128} textureRect - {{1824,243},{116,112}} + {{1805,545},{116,112}} textureRotated @@ -1965,7 +1965,7 @@ spriteSourceSize {128,128} textureRect - {{1874,605},{116,112}} + {{1805,767},{116,112}} textureRotated @@ -1980,7 +1980,7 @@ spriteSourceSize {128,128} textureRect - {{1626,863},{116,112}} + {{1923,851},{116,112}} textureRotated @@ -1995,7 +1995,7 @@ spriteSourceSize {128,128} textureRect - {{1744,866},{116,112}} + {{1805,881},{116,112}} textureRotated @@ -2010,9 +2010,9 @@ spriteSourceSize {128,128} textureRect - {{898,1407},{116,112}} + {{1923,965},{116,112}} textureRotated - + ItemIcon_TV_AdBlock.png @@ -2025,9 +2025,9 @@ spriteSourceSize {128,128} textureRect - {{1512,860},{112,118}} + {{1685,430},{112,118}} textureRotated - + ItemIcon_Ticket_Gold.Png @@ -2040,7 +2040,7 @@ spriteSourceSize {128,128} textureRect - {{1310,1089},{128,100}} + {{856,1385},{128,100}} textureRotated @@ -2055,7 +2055,7 @@ spriteSourceSize {128,128} textureRect - {{901,721},{126,116}} + {{316,1348},{126,116}} textureRotated @@ -2070,7 +2070,7 @@ spriteSourceSize {128,128} textureRect - {{1269,991},{128,96}} + {{715,732},{128,96}} textureRotated @@ -2085,7 +2085,7 @@ spriteSourceSize {128,128} textureRect - {{1384,646},{128,96}} + {{1152,863},{128,96}} textureRotated @@ -2100,7 +2100,7 @@ spriteSourceSize {128,128} textureRect - {{1837,145},{128,96}} + {{1282,863},{128,96}} textureRotated @@ -2115,7 +2115,7 @@ spriteSourceSize {128,128} textureRect - {{1522,1052},{104,110}} + {{1595,1183},{104,110}} textureRotated @@ -2130,7 +2130,7 @@ spriteSourceSize {80,83} textureRect - {{1341,544},{80,83}} + {{911,1303},{80,83}} textureRotated @@ -2145,9 +2145,9 @@ spriteSourceSize {80,83} textureRect - {{1471,1296},{80,83}} + {{996,1303},{80,83}} textureRotated - + LvlMapAvailable.png @@ -2160,7 +2160,7 @@ spriteSourceSize {35,32} textureRect - {{1837,111},{35,32}} + {{1231,103},{35,32}} textureRotated @@ -2175,7 +2175,7 @@ spriteSourceSize {42,43} textureRect - {{1592,1485},{42,43}} + {{478,1301},{42,43}} textureRotated @@ -2190,9 +2190,9 @@ spriteSourceSize {60,62} textureRect - {{1829,1323},{60,62}} + {{1824,1411},{60,62}} textureRotated - + ResourceBar_Single_Btn_Blue2.png @@ -2205,9 +2205,9 @@ spriteSourceSize {33,34} textureRect - {{1815,1385},{33,34}} + {{740,1429},{33,34}} textureRotated - + ResourceBar_Single_Btn_Purple1.png @@ -2220,7 +2220,7 @@ spriteSourceSize {60,62} textureRect - {{1893,1329},{60,62}} + {{1886,1413},{60,62}} textureRotated @@ -2235,7 +2235,7 @@ spriteSourceSize {33,34} textureRect - {{1850,1385},{33,34}} + {{1550,554},{33,34}} textureRotated @@ -2250,7 +2250,7 @@ spriteSourceSize {60,62} textureRect - {{1957,1329},{60,62}} + {{1950,1413},{60,62}} textureRotated @@ -2265,7 +2265,7 @@ spriteSourceSize {33,34} textureRect - {{491,640},{33,34}} + {{2005,59},{33,34}} textureRotated @@ -2280,9 +2280,9 @@ spriteSourceSize {67,75} textureRect - {{1253,1239},{67,75}} + {{1626,1490},{67,75}} textureRotated - + ResourceBar_Single_Icon_Energy.png @@ -2295,9 +2295,9 @@ spriteSourceSize {57,79} textureRect - {{1624,1295},{57,79}} + {{1081,1302},{57,79}} textureRotated - + ResourceBar_Single_Icon_Gem.png @@ -2310,7 +2310,7 @@ spriteSourceSize {77,69} textureRect - {{1553,1274},{77,69}} + {{1626,1411},{77,69}} textureRotated @@ -2325,9 +2325,9 @@ spriteSourceSize {60,62} textureRect - {{1857,1421},{60,62}} + {{1824,1475},{60,62}} textureRotated - + ResourceBar_White_Icon1.png @@ -2340,7 +2340,7 @@ spriteSourceSize {28,28} textureRect - {{1885,1391},{28,28}} + {{2005,95},{28,28}} textureRotated @@ -2355,9 +2355,9 @@ spriteSourceSize {361,44} textureRect - {{697,1},{361,44}} + {{1,1101},{361,44}} textureRotated - + Rounded Rectangle 1029 copy 11.png @@ -2370,7 +2370,7 @@ spriteSourceSize {72,40} textureRect - {{1992,605},{72,40}} + {{1584,1419},{72,40}} textureRotated @@ -2385,9 +2385,9 @@ spriteSourceSize {238,41} textureRect - {{1060,157},{238,41}} + {{926,146},{238,41}} textureRotated - + Screen Dimmed.png @@ -2400,9 +2400,9 @@ spriteSourceSize {108,234} textureRect - {{1643,1},{108,234}} + {{301,587},{108,234}} textureRotated - + SkillFrame_s_Empty.png @@ -2415,9 +2415,9 @@ spriteSourceSize {36,56} textureRect - {{1534,1481},{36,56}} + {{2005,1},{36,56}} textureRotated - + Title_Ribbon01_Orange.png @@ -2430,7 +2430,7 @@ spriteSourceSize {304,143} textureRect - {{103,1111},{304,143}} + {{49,832},{304,143}} textureRotated @@ -2445,7 +2445,7 @@ spriteSourceSize {304,143} textureRect - {{346,373},{304,143}} + {{47,1138},{304,143}} textureRotated @@ -2460,7 +2460,7 @@ spriteSourceSize {124,82} textureRect - {{1846,1197},{124,82}} + {{1468,1295},{124,82}} textureRotated @@ -2475,7 +2475,7 @@ spriteSourceSize {124,82} textureRect - {{1930,1203},{124,82}} + {{1485,428},{124,82}} textureRotated @@ -2490,10 +2490,25 @@ spriteSourceSize {540,143} textureRect - {{1,49},{540,143}} + {{422,1},{540,143}} textureRotated + ToastMessage_Bg_Gray.png + + aliases + + spriteOffset + {0,0} + spriteSize + {4,32} + spriteSourceSize + {4,32} + textureRect + {{1152,857},{4,32}} + textureRotated + + UI-02.png aliases @@ -2505,9 +2520,9 @@ spriteSourceSize {105,10} textureRect - {{822,1217},{105,10}} + {{2016,1181},{105,10}} textureRotated - + UI-03.png @@ -2520,10 +2535,25 @@ spriteSourceSize {111,16} textureRect - {{214,1417},{111,16}} + {{1686,1295},{111,16}} textureRotated + Victory.png + + aliases + + spriteOffset + {-1,-28} + spriteSize + {419,402} + spriteSourceSize + {561,458} + textureRect + {{1,1},{419,402}} + textureRotated + + baoxiang.png aliases @@ -2535,9 +2565,9 @@ spriteSourceSize {138,123} textureRect - {{1055,344},{138,123}} + {{590,569},{138,123}} textureRotated - + bg.png @@ -2550,7 +2580,7 @@ spriteSourceSize {190,56} textureRect - {{248,1350},{190,56}} + {{969,332},{190,56}} textureRotated @@ -2565,9 +2595,9 @@ spriteSourceSize {694,46} textureRect - {{1,1},{694,46}} + {{1,405},{694,46}} textureRotated - + black.png @@ -2580,7 +2610,7 @@ spriteSourceSize {111,109} textureRect - {{103,1417},{111,109}} + {{1286,1495},{111,109}} textureRotated @@ -2595,9 +2625,9 @@ spriteSourceSize {259,96} textureRect - {{1382,1},{259,96}} + {{318,823},{259,96}} textureRotated - + btn_add.png @@ -2610,7 +2640,7 @@ spriteSourceSize {71,71} textureRect - {{1534,1408},{71,71}} + {{1704,1284},{71,71}} textureRotated @@ -2625,9 +2655,9 @@ spriteSourceSize {55,145} textureRect - {{822,1070},{55,145}} + {{1683,255},{55,145}} textureRotated - + button_gray.png @@ -2640,7 +2670,7 @@ spriteSourceSize {55,145} textureRect - {{879,1070},{55,145}} + {{877,570},{55,145}} textureRotated @@ -2655,9 +2685,9 @@ spriteSourceSize {55,145} textureRect - {{936,1071},{55,145}} + {{934,660},{55,145}} textureRotated - + button_purple.png @@ -2670,7 +2700,7 @@ spriteSourceSize {55,145} textureRect - {{1253,1092},{55,145}} + {{756,1134},{55,145}} textureRotated @@ -2685,9 +2715,9 @@ spriteSourceSize {55,145} textureRect - {{1384,127},{55,145}} + {{740,1282},{55,145}} textureRotated - + button_sky.png @@ -2700,7 +2730,7 @@ spriteSourceSize {55,145} textureRect - {{1542,127},{55,145}} + {{797,1281},{55,145}} textureRotated @@ -2715,9 +2745,9 @@ spriteSourceSize {55,145} textureRect - {{1599,227},{55,145}} + {{799,1428},{55,145}} textureRotated - + button_yellow.png @@ -2730,7 +2760,7 @@ spriteSourceSize {55,145} textureRect - {{1767,227},{55,145}} + {{854,1238},{55,145}} textureRotated @@ -2745,7 +2775,7 @@ spriteSourceSize {97,97} textureRect - {{1070,1308},{97,97}} + {{1917,1181},{97,97}} textureRotated @@ -2760,7 +2790,7 @@ spriteSourceSize {34,63} textureRect - {{1,1478},{34,63}} + {{1485,554},{34,63}} textureRotated @@ -2775,7 +2805,7 @@ spriteSourceSize {180,38} textureRect - {{854,584},{180,38}} + {{700,1282},{180,38}} textureRotated @@ -2790,7 +2820,7 @@ spriteSourceSize {38,38} textureRect - {{1992,679},{38,38}} + {{813,1238},{38,38}} textureRotated @@ -2805,9 +2835,9 @@ spriteSourceSize {112,109} textureRect - {{1435,433},{112,109}} + {{1397,1493},{112,109}} textureRotated - + equipment_frame_blue.png @@ -2820,9 +2850,9 @@ spriteSourceSize {177,188} textureRect - {{343,194},{177,188}} + {{969,142},{177,188}} textureRotated - + equipment_frame_brown.png @@ -2835,9 +2865,9 @@ spriteSourceSize {177,188} textureRect - {{533,195},{177,188}} + {{411,569},{177,188}} textureRotated - + equipment_frame_green.png @@ -2850,7 +2880,7 @@ spriteSourceSize {177,188} textureRect - {{530,374},{177,188}} + {{416,759},{177,188}} textureRotated @@ -2865,9 +2895,9 @@ spriteSourceSize {177,188} textureRect - {{724,47},{177,188}} + {{416,949},{177,188}} textureRotated - + equipment_frame_red.png @@ -2880,7 +2910,7 @@ spriteSourceSize {177,188} textureRect - {{723,226},{177,188}} + {{718,391},{177,188}} textureRotated @@ -2895,9 +2925,9 @@ spriteSourceSize {177,188} textureRect - {{709,405},{177,188}} + {{1148,142},{177,188}} textureRotated - + gbar.png @@ -2910,7 +2940,7 @@ spriteSourceSize {166,20} textureRect - {{879,766},{166,20}} + {{908,391},{166,20}} textureRotated @@ -2925,9 +2955,9 @@ spriteSourceSize {212,26} textureRect - {{1382,99},{212,26}} + {{1489,104},{212,26}} textureRotated - + line_bg.png @@ -2940,9 +2970,9 @@ spriteSourceSize {350,91} textureRect - {{253,376},{350,91}} + {{1331,1},{350,91}} textureRotated - + line_left.png @@ -2955,7 +2985,7 @@ spriteSourceSize {106,91} textureRect - {{1738,1196},{106,91}} + {{856,1515},{106,91}} textureRotated @@ -2970,7 +3000,7 @@ spriteSourceSize {67,53} textureRect - {{1553,1353},{67,53}} + {{1415,1138},{67,53}} textureRotated @@ -2985,7 +3015,7 @@ spriteSourceSize {157,157} textureRect - {{663,1070},{157,157}} + {{595,833},{157,157}} textureRotated @@ -3000,9 +3030,9 @@ spriteSourceSize {128,56} textureRect - {{440,1350},{128,56}} + {{1357,1063},{128,56}} textureRotated - + redbar.png @@ -3015,7 +3045,7 @@ spriteSourceSize {129,8} textureRect - {{1627,853},{129,8}} + {{47,1444},{129,8}} textureRotated @@ -3030,7 +3060,7 @@ spriteSourceSize {191,26} textureRect - {{851,766},{191,26}} + {{1533,104},{191,26}} textureRotated @@ -3045,9 +3075,9 @@ spriteSourceSize {216,8} textureRect - {{841,746},{216,8}} + {{1331,94},{216,8}} textureRotated - + redbg1.png @@ -3060,7 +3090,7 @@ spriteSourceSize {258,30} textureRect - {{1060,125},{258,30}} + {{422,391},{258,30}} textureRotated @@ -3075,9 +3105,9 @@ spriteSourceSize {265,37} textureRect - {{491,373},{265,37}} + {{964,103},{265,37}} textureRotated - + rund_bg.png @@ -3090,7 +3120,7 @@ spriteSourceSize {1024,1024} textureRect - {{1058,200},{142,142}} + {{541,1463},{142,142}} textureRotated @@ -3105,7 +3135,7 @@ spriteSourceSize {32,12} textureRect - {{899,405},{32,12}} + {{2029,125},{32,12}} textureRotated @@ -3120,7 +3150,7 @@ spriteSourceSize {61,69} textureRect - {{732,1345},{61,69}} + {{1704,1357},{61,69}} textureRotated @@ -3135,7 +3165,7 @@ spriteSourceSize {128,128} textureRect - {{1522,1164},{104,108}} + {{1701,1174},{104,108}} textureRotated @@ -3150,7 +3180,7 @@ spriteSourceSize {32,32} textureRect - {{66,1478},{32,32}} + {{1651,670},{32,32}} textureRotated @@ -3165,9 +3195,9 @@ spriteSourceSize {32,32} textureRect - {{2002,1049},{30,32}} + {{682,391},{30,32}} textureRotated - + status_icon_bleeding_41.png @@ -3180,9 +3210,9 @@ spriteSourceSize {32,32} textureRect - {{1998,821},{30,32}} + {{799,1575},{30,32}} textureRotated - + status_icon_broken_weapon_73.png @@ -3195,7 +3225,7 @@ spriteSourceSize {32,32} textureRect - {{1994,719},{32,32}} + {{1484,1138},{32,32}} textureRotated @@ -3210,7 +3240,7 @@ spriteSourceSize {32,32} textureRect - {{1968,1049},{32,32}} + {{1626,1567},{32,32}} textureRotated @@ -3225,7 +3255,7 @@ spriteSourceSize {32,32} textureRect - {{1994,753},{32,32}} + {{1888,1475},{32,32}} textureRotated @@ -3240,7 +3270,7 @@ spriteSourceSize {32,32} textureRect - {{1994,787},{32,32}} + {{1268,103},{32,32}} textureRotated @@ -3255,7 +3285,7 @@ spriteSourceSize {32,32} textureRect - {{456,1163},{32,32}} + {{1660,1567},{32,32}} textureRotated @@ -3270,7 +3300,7 @@ spriteSourceSize {32,32} textureRect - {{1998,855},{32,32}} + {{1888,1509},{32,32}} textureRotated @@ -3285,7 +3315,7 @@ spriteSourceSize {32,32} textureRect - {{1668,1483},{32,32}} + {{1651,704},{32,32}} textureRotated @@ -3300,7 +3330,7 @@ spriteSourceSize {32,32} textureRect - {{954,1218},{32,32}} + {{1648,738},{32,32}} textureRotated @@ -3315,9 +3345,9 @@ spriteSourceSize {32,32} textureRect - {{1636,1479},{30,32}} + {{1922,1511},{30,32}} textureRotated - + status_icon_defense_80.png @@ -3330,7 +3360,7 @@ spriteSourceSize {32,32} textureRect - {{1953,1427},{30,32}} + {{1956,1511},{30,32}} textureRotated @@ -3345,9 +3375,9 @@ spriteSourceSize {96,96} textureRect - {{1942,269},{90,88}} + {{1078,1513},{90,88}} textureRotated - + status_icon_disarmed_132.png @@ -3360,7 +3390,7 @@ spriteSourceSize {32,32} textureRect - {{1987,1393},{30,32}} + {{1990,1477},{30,32}} textureRotated @@ -3375,7 +3405,7 @@ spriteSourceSize {32,32} textureRect - {{954,1252},{32,32}} + {{1648,772},{32,32}} textureRotated @@ -3390,7 +3420,7 @@ spriteSourceSize {32,32} textureRect - {{1980,889},{32,32}} + {{1922,1477},{32,32}} textureRotated @@ -3405,7 +3435,7 @@ spriteSourceSize {32,32} textureRect - {{1980,923},{32,32}} + {{1956,1477},{32,32}} textureRotated @@ -3420,7 +3450,7 @@ spriteSourceSize {32,32} textureRect - {{1987,1427},{30,32}} + {{1990,1511},{30,32}} textureRotated @@ -3435,7 +3465,7 @@ spriteSourceSize {32,32} textureRect - {{1919,1391},{32,32}} + {{1697,1485},{32,32}} textureRotated @@ -3450,7 +3480,7 @@ spriteSourceSize {32,32} textureRect - {{1919,1459},{30,32}} + {{1695,1553},{30,32}} textureRotated @@ -3465,7 +3495,7 @@ spriteSourceSize {32,32} textureRect - {{1919,1425},{32,32}} + {{1731,1485},{32,32}} textureRotated @@ -3480,7 +3510,7 @@ spriteSourceSize {32,32} textureRect - {{1953,1393},{32,32}} + {{1765,1485},{32,32}} textureRotated @@ -3495,7 +3525,7 @@ spriteSourceSize {32,32} textureRect - {{1953,1459},{32,32}} + {{1695,1519},{32,32}} textureRotated @@ -3510,7 +3540,7 @@ spriteSourceSize {32,32} textureRect - {{1987,1461},{32,32}} + {{1729,1519},{32,32}} textureRotated @@ -3525,7 +3555,7 @@ spriteSourceSize {32,32} textureRect - {{1702,1485},{32,32}} + {{1763,1519},{32,32}} textureRotated @@ -3540,9 +3570,9 @@ spriteSourceSize {32,32} textureRect - {{1804,1485},{30,32}} + {{1729,1553},{30,32}} textureRotated - + status_icon_strength_0.png @@ -3555,7 +3585,7 @@ spriteSourceSize {32,32} textureRect - {{1736,1485},{32,32}} + {{1763,1553},{32,32}} textureRotated @@ -3570,7 +3600,7 @@ spriteSourceSize {32,32} textureRect - {{1770,1485},{32,32}} + {{1797,1537},{32,32}} textureRotated @@ -3585,7 +3615,7 @@ spriteSourceSize {56,62} textureRect - {{1968,985},{56,62}} + {{1905,1349},{56,62}} textureRotated @@ -3600,9 +3630,9 @@ spriteSourceSize {63,59} textureRect - {{1622,1354},{63,59}} + {{1763,1420},{63,59}} textureRotated - + ybar.png @@ -3615,7 +3645,7 @@ spriteSourceSize {35,14} textureRect - {{232,1417},{35,14}} + {{522,1301},{35,14}} textureRotated @@ -3630,7 +3660,7 @@ spriteSourceSize {216,14} textureRect - {{825,746},{216,14}} + {{1517,104},{216,14}} textureRotated @@ -3646,9 +3676,9 @@ realTextureFileName gui.png size - {2033,1529} + {2042,1607} smartupdate - $TexturePacker:SmartUpdate:5cb4589744f75cc79accf9c8b9bf6357:eb42edb3504c355a8662b0054ce832b7:5f86533554b8a62fd9d2a17dd9533d7c$ + $TexturePacker:SmartUpdate:58431ab27809d13384147ff7a770b912:8cfc49039abc725f50fb93a80f8bd8e3:5f86533554b8a62fd9d2a17dd9533d7c$ textureFileName gui.png diff --git a/assets/resources/gui/gui.plist.meta b/assets/resources/gui/gui.plist.meta index 27122c90..bf6adb46 100644 --- a/assets/resources/gui/gui.plist.meta +++ b/assets/resources/gui/gui.plist.meta @@ -16,11 +16,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1512, - "trimY": 860, + "trimX": 1685, + "trimY": 430, "width": 112, "height": 118, "rawWidth": 128, @@ -65,8 +65,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 854, - "trimY": 584, + "trimX": 700, + "trimY": 1282, "width": 180, "height": 38, "rawWidth": 180, @@ -111,8 +111,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1, - "trimY": 194, + "trimX": 49, + "trimY": 405, "width": 340, "height": 180, "rawWidth": 360, @@ -157,8 +157,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1514, - "trimY": 648, + "trimX": 1255, + "trimY": 1193, "width": 100, "height": 126, "rawWidth": 128, @@ -200,11 +200,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1426, - "trimY": 544, + "trimX": 1366, + "trimY": 1367, "width": 124, "height": 100, "rawWidth": 128, @@ -246,11 +246,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1060, - "trimY": 1, + "trimX": 192, + "trimY": 1154, "width": 320, "height": 122, "rawWidth": 320, @@ -292,11 +292,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1872, - "trimY": 357, + "trimX": 1829, + "trimY": 373, "width": 60, "height": 122, "rawWidth": 60, @@ -338,11 +338,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1627, - "trimY": 751, + "trimX": 1060, + "trimY": 1385, "width": 100, "height": 126, "rawWidth": 128, @@ -384,11 +384,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1656, - "trimY": 531, + "trimX": 1508, + "trimY": 1493, "width": 116, "height": 112, "rawWidth": 128, @@ -433,8 +433,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1522, - "trimY": 1052, + "trimX": 1595, + "trimY": 1183, "width": 104, "height": 110, "rawWidth": 128, @@ -476,11 +476,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1795, - "trimY": 1421, + "trimX": 1963, + "trimY": 1350, "width": 60, "height": 62, "rawWidth": 60, @@ -525,8 +525,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 530, - "trimY": 374, + "trimX": 416, + "trimY": 759, "width": 177, "height": 188, "rawWidth": 177, @@ -571,8 +571,8 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 1628, - "trimY": 1077, + "trimX": 1808, + "trimY": 995, "width": 110, "height": 108, "rawWidth": 128, @@ -617,8 +617,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1060, - "trimY": 125, + "trimX": 422, + "trimY": 391, "width": 258, "height": 30, "rawWidth": 258, @@ -660,11 +660,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1549, - "trimY": 284, + "trimX": 1601, + "trimY": 312, "width": 114, "height": 116, "rawWidth": 128, @@ -706,11 +706,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1288, - "trimY": 626, + "trimX": 1081, + "trimY": 652, "width": 94, "height": 118, "rawWidth": 94, @@ -752,11 +752,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1665, - "trimY": 284, + "trimX": 1283, + "trimY": 961, "width": 100, "height": 126, "rawWidth": 128, @@ -798,11 +798,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 570, - "trimY": 1342, + "trimX": 1697, + "trimY": 1420, "width": 64, "height": 63, "rawWidth": 64, @@ -847,8 +847,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1665, - "trimY": 412, + "trimX": 1528, + "trimY": 836, "width": 103, "height": 117, "rawWidth": 103, @@ -893,8 +893,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 543, - "trimY": 49, + "trimX": 391, + "trimY": 423, "width": 144, "height": 179, "rawWidth": 144, @@ -939,8 +939,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 410, - "trimY": 1163, + "trimX": 1605, + "trimY": 670, "width": 44, "height": 42, "rawWidth": 44, @@ -982,11 +982,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1169, - "trimY": 1308, + "trimX": 845, + "trimY": 732, "width": 97, "height": 96, "rawWidth": 97, @@ -1031,8 +1031,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1319, - "trimY": 430, + "trimX": 151, + "trimY": 1454, "width": 20, "height": 20, "rawWidth": 20, @@ -1074,11 +1074,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 377, - "trimY": 1001, + "trimX": 1443, + "trimY": 590, "width": 122, "height": 98, "rawWidth": 122, @@ -1123,8 +1123,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1369, - "trimY": 1305, + "trimX": 1383, + "trimY": 1193, "width": 100, "height": 100, "rawWidth": 100, @@ -1166,11 +1166,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1438, - "trimY": 1200, + "trimX": 1140, + "trimY": 1290, "width": 82, "height": 94, "rawWidth": 82, @@ -1212,11 +1212,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1267, - "trimY": 1308, + "trimX": 318, + "trimY": 1084, "width": 100, "height": 96, "rawWidth": 100, @@ -1261,8 +1261,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1330, - "trimY": 1219, + "trimX": 915, + "trimY": 1217, "width": 84, "height": 106, "rawWidth": 84, @@ -1307,8 +1307,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1440, - "trimY": 184, + "trimX": 1255, + "trimY": 1070, "width": 100, "height": 121, "rawWidth": 100, @@ -1353,8 +1353,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1279, - "trimY": 876, + "trimX": 1204, + "trimY": 748, "width": 119, "height": 113, "rawWidth": 119, @@ -1399,8 +1399,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1319, - "trimY": 304, + "trimX": 907, + "trimY": 961, "width": 124, "height": 114, "rawWidth": 124, @@ -1445,8 +1445,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1301, - "trimY": 484, + "trimX": 737, + "trimY": 992, "width": 140, "height": 38, "rawWidth": 160, @@ -1488,11 +1488,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -2, "offsetY": 2, - "trimX": 1, - "trimY": 1111, + "trimX": 964, + "trimY": 1, "width": 365, "height": 100, "rawWidth": 389, @@ -1534,11 +1534,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 635, - "trimY": 1345, + "trimX": 1629, + "trimY": 1082, "width": 95, "height": 61, "rawWidth": 95, @@ -1583,8 +1583,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 376, + "trimX": 422, + "trimY": 146, "width": 250, "height": 243, "rawWidth": 250, @@ -1629,8 +1629,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 621, + "trimX": 49, + "trimY": 587, "width": 250, "height": 243, "rawWidth": 250, @@ -1675,8 +1675,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 866, + "trimX": 674, + "trimY": 146, "width": 250, "height": 243, "rawWidth": 250, @@ -1718,11 +1718,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 937, - "trimY": 955, + "trimX": 1236, + "trimY": 1295, "width": 70, "height": 114, "rawWidth": 70, @@ -1764,11 +1764,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 810, - "trimY": 1229, + "trimX": 1352, + "trimY": 1295, "width": 70, "height": 114, "rawWidth": 70, @@ -1810,11 +1810,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 882, - "trimY": 1229, + "trimX": 1468, + "trimY": 1421, "width": 70, "height": 114, "rawWidth": 70, @@ -1856,11 +1856,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1012, - "trimY": 1407, + "trimX": 1412, + "trimY": 954, "width": 70, "height": 114, "rawWidth": 70, @@ -1902,19 +1902,19 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1462, - "trimY": 1407, + "trimX": 1692, + "trimY": 1102, "width": 70, "height": 114, "rawWidth": 70, "rawHeight": 114, "borderTop": 0, "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderLeft": 31, + "borderRight": 32, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -1951,8 +1951,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1512, - "trimY": 980, + "trimX": 1808, + "trimY": 1105, "width": 70, "height": 114, "rawWidth": 70, @@ -1997,8 +1997,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1962, - "trimY": 1087, + "trimX": 1614, + "trimY": 1295, "width": 70, "height": 114, "rawWidth": 70, @@ -2043,8 +2043,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1019, - "trimY": 859, + "trimX": 1074, + "trimY": 748, "width": 128, "height": 107, "rawWidth": 128, @@ -2086,11 +2086,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1149, - "trimY": 874, + "trimX": 1325, + "trimY": 704, "width": 128, "height": 107, "rawWidth": 128, @@ -2135,8 +2135,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1009, - "trimY": 968, + "trimX": 1023, + "trimY": 961, "width": 128, "height": 107, "rawWidth": 128, @@ -2181,8 +2181,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1139, - "trimY": 983, + "trimX": 1153, + "trimY": 961, "width": 128, "height": 107, "rawWidth": 128, @@ -2227,8 +2227,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 530, - "trimY": 564, + "trimX": 715, + "trimY": 570, "width": 160, "height": 160, "rawWidth": 160, @@ -2273,8 +2273,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 501, - "trimY": 726, + "trimX": 1327, + "trimY": 104, "width": 160, "height": 160, "rawWidth": 160, @@ -2316,11 +2316,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1770, - "trimY": 630, + "trimX": 1135, + "trimY": 1186, "width": 102, "height": 118, "rawWidth": 102, @@ -2362,11 +2362,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1874, - "trimY": 719, + "trimX": 1544, + "trimY": 714, "width": 102, "height": 118, "rawWidth": 102, @@ -2408,11 +2408,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 253, - "trimY": 728, + "trimX": 1683, + "trimY": 1, "width": 320, "height": 122, "rawWidth": 320, @@ -2457,8 +2457,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 377, - "trimY": 679, + "trimX": 194, + "trimY": 832, "width": 320, "height": 122, "rawWidth": 320, @@ -2503,8 +2503,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 914, - "trimY": 47, + "trimX": 572, + "trimY": 423, "width": 144, "height": 144, "rawWidth": 160, @@ -2549,8 +2549,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 914, - "trimY": 193, + "trimX": 1683, + "trimY": 125, "width": 128, "height": 142, "rawWidth": 160, @@ -2592,11 +2592,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 248, - "trimY": 1408, + "trimX": 1561, + "trimY": 94, "width": 120, "height": 116, "rawWidth": 160, @@ -2641,8 +2641,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1879, - "trimY": 1, + "trimX": 1, + "trimY": 1464, "width": 142, "height": 148, "rawWidth": 160, @@ -2687,8 +2687,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 913, - "trimY": 323, + "trimX": 595, + "trimY": 992, "width": 140, "height": 140, "rawWidth": 160, @@ -2730,11 +2730,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 662, - "trimY": 1229, + "trimX": 640, + "trimY": 1134, "width": 114, "height": 146, "rawWidth": 160, @@ -2776,11 +2776,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 410, - "trimY": 1212, + "trimX": 754, + "trimY": 830, "width": 144, "height": 136, "rawWidth": 160, @@ -2825,8 +2825,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 899, - "trimY": 465, + "trimX": 1830, + "trimY": 249, "width": 136, "height": 122, "rawWidth": 160, @@ -2871,8 +2871,8 @@ "rotated": false, "offsetX": 1, "offsetY": -3, - "trimX": 1202, - "trimY": 200, + "trimX": 685, + "trimY": 1464, "width": 112, "height": 142, "rawWidth": 160, @@ -2914,11 +2914,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1195, - "trimY": 344, + "trimX": 1827, + "trimY": 125, "width": 138, "height": 122, "rawWidth": 160, @@ -2963,8 +2963,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 253, - "trimY": 1050, + "trimX": 930, + "trimY": 390, "width": 122, "height": 136, "rawWidth": 160, @@ -3009,8 +3009,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1151, - "trimY": 744, + "trimX": 944, + "trimY": 717, "width": 128, "height": 128, "rawWidth": 160, @@ -3055,8 +3055,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 692, - "trimY": 584, + "trimX": 1327, + "trimY": 266, "width": 160, "height": 160, "rawWidth": 160, @@ -3101,8 +3101,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 501, - "trimY": 888, + "trimX": 316, + "trimY": 1186, "width": 160, "height": 160, "rawWidth": 160, @@ -3147,8 +3147,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 663, - "trimY": 746, + "trimX": 478, + "trimY": 1139, "width": 160, "height": 160, "rawWidth": 160, @@ -3193,8 +3193,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 663, - "trimY": 908, + "trimX": 1161, + "trimY": 332, "width": 160, "height": 160, "rawWidth": 160, @@ -3239,8 +3239,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 248, - "trimY": 1188, + "trimX": 1323, + "trimY": 428, "width": 160, "height": 160, "rawWidth": 160, @@ -3285,8 +3285,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 501, - "trimY": 1050, + "trimX": 538, + "trimY": 1301, "width": 160, "height": 160, "rawWidth": 160, @@ -3331,8 +3331,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1320, - "trimY": 125, + "trimX": 416, + "trimY": 1139, "width": 41, "height": 48, "rawWidth": 41, @@ -3374,11 +3374,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 377, - "trimY": 1101, + "trimX": 1967, + "trimY": 125, "width": 60, "height": 122, "rawWidth": 60, @@ -3423,8 +3423,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1967, - "trimY": 145, + "trimX": 1968, + "trimY": 249, "width": 60, "height": 122, "rawWidth": 60, @@ -3469,8 +3469,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1872, - "trimY": 481, + "trimX": 1543, + "trimY": 590, "width": 60, "height": 122, "rawWidth": 60, @@ -3512,11 +3512,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1874, - "trimY": 823, + "trimX": 1633, + "trimY": 834, "width": 60, "height": 122, "rawWidth": 60, @@ -3558,11 +3558,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 803, - "trimY": 1345, + "trimX": 1630, + "trimY": 958, "width": 60, "height": 122, "rawWidth": 60, @@ -3607,8 +3607,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1288, - "trimY": 1406, + "trimX": 1552, + "trimY": 1295, "width": 60, "height": 122, "rawWidth": 60, @@ -3650,11 +3650,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1607, - "trimY": 1415, + "trimX": 1953, + "trimY": 373, "width": 60, "height": 62, "rawWidth": 60, @@ -3699,8 +3699,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1705, - "trimY": 1295, + "trimX": 1777, + "trimY": 1285, "width": 60, "height": 62, "rawWidth": 60, @@ -3745,8 +3745,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1767, - "trimY": 1289, + "trimX": 1839, + "trimY": 1285, "width": 60, "height": 62, "rawWidth": 60, @@ -3788,11 +3788,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1687, - "trimY": 1359, + "trimX": 1901, + "trimY": 1285, "width": 60, "height": 62, "rawWidth": 60, @@ -3837,8 +3837,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1669, - "trimY": 1421, + "trimX": 1963, + "trimY": 1288, "width": 60, "height": 62, "rawWidth": 60, @@ -3880,11 +3880,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1733, - "trimY": 1421, + "trimX": 1777, + "trimY": 1349, "width": 60, "height": 62, "rawWidth": 60, @@ -3929,8 +3929,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1751, - "trimY": 1359, + "trimX": 1841, + "trimY": 1349, "width": 60, "height": 62, "rawWidth": 60, @@ -3975,8 +3975,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 894, - "trimY": 589, + "trimX": 151, + "trimY": 1476, "width": 128, "height": 130, "rawWidth": 128, @@ -4018,11 +4018,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1037, - "trimY": 469, + "trimX": 281, + "trimY": 1476, "width": 128, "height": 130, "rawWidth": 128, @@ -4064,11 +4064,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1024, - "trimY": 599, + "trimX": 411, + "trimY": 1476, "width": 128, "height": 130, "rawWidth": 128, @@ -4110,11 +4110,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1169, - "trimY": 484, + "trimX": 777, + "trimY": 976, "width": 128, "height": 130, "rawWidth": 128, @@ -4156,11 +4156,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1156, - "trimY": 614, + "trimX": 934, + "trimY": 528, "width": 128, "height": 130, "rawWidth": 128, @@ -4202,11 +4202,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1019, - "trimY": 729, + "trimX": 1064, + "trimY": 520, "width": 128, "height": 130, "rawWidth": 128, @@ -4251,8 +4251,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1852, - "trimY": 1087, + "trimX": 1695, + "trimY": 890, "width": 108, "height": 108, "rawWidth": 128, @@ -4294,11 +4294,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1435, - "trimY": 307, + "trimX": 1317, + "trimY": 590, "width": 124, "height": 112, "rawWidth": 128, @@ -4343,8 +4343,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 825, - "trimY": 964, + "trimX": 1023, + "trimY": 1196, "width": 110, "height": 104, "rawWidth": 128, @@ -4389,8 +4389,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1744, - "trimY": 980, + "trimX": 1489, + "trimY": 322, "width": 110, "height": 104, "rawWidth": 128, @@ -4432,11 +4432,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1123, - "trimY": 1092, + "trimX": 813, + "trimY": 1108, "width": 128, "height": 100, "rawWidth": 128, @@ -4481,8 +4481,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1084, - "trimY": 1407, + "trimX": 1528, + "trimY": 955, "width": 100, "height": 114, "rawWidth": 128, @@ -4524,11 +4524,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1186, - "trimY": 1407, + "trimX": 1692, + "trimY": 1000, "width": 100, "height": 114, "rawWidth": 128, @@ -4570,11 +4570,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 1856, - "trimY": 985, + "trimX": 1527, + "trimY": 1071, "width": 100, "height": 110, "rawWidth": 128, @@ -4619,8 +4619,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1400, - "trimY": 986, + "trimX": 1924, + "trimY": 1079, "width": 100, "height": 110, "rawWidth": 128, @@ -4665,8 +4665,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 954, - "trimY": 1299, + "trimX": 1927, + "trimY": 435, "width": 114, "height": 106, "rawWidth": 128, @@ -4711,8 +4711,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 901, - "trimY": 849, + "trimX": 1168, + "trimY": 1502, "width": 116, "height": 104, "rawWidth": 128, @@ -4754,11 +4754,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 1934, - "trimY": 483, + "trimX": 1561, + "trimY": 212, "width": 120, "height": 98, "rawWidth": 128, @@ -4800,11 +4800,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 993, - "trimY": 1191, + "trimX": 915, + "trimY": 1087, "width": 128, "height": 106, "rawWidth": 128, @@ -4849,8 +4849,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1934, - "trimY": 359, + "trimX": 1605, + "trimY": 546, "width": 122, "height": 98, "rawWidth": 128, @@ -4892,11 +4892,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1719, - "trimY": 111, + "trimX": 1412, + "trimY": 836, "width": 114, "height": 116, "rawWidth": 128, @@ -4938,11 +4938,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 586, - "trimY": 1408, + "trimX": 1923, + "trimY": 647, "width": 118, "height": 100, "rawWidth": 128, @@ -4984,11 +4984,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 476, - "trimY": 1408, + "trimX": 1805, + "trimY": 435, "width": 120, "height": 108, "rawWidth": 128, @@ -5030,11 +5030,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1281, - "trimY": 746, + "trimX": 1022, + "trimY": 857, "width": 128, "height": 102, "rawWidth": 128, @@ -5079,8 +5079,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1400, - "trimY": 860, + "trimX": 1023, + "trimY": 1070, "width": 110, "height": 124, "rawWidth": 128, @@ -5125,8 +5125,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1599, - "trimY": 111, + "trimX": 1135, + "trimY": 1070, "width": 118, "height": 114, "rawWidth": 128, @@ -5168,11 +5168,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1385, - "trimY": 744, + "trimX": 1201, + "trimY": 624, "width": 122, "height": 114, "rawWidth": 128, @@ -5214,11 +5214,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 993, - "trimY": 1077, + "trimX": 1194, + "trimY": 494, "width": 128, "height": 112, "rawWidth": 128, @@ -5263,8 +5263,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1628, - "trimY": 1187, + "trimX": 1807, + "trimY": 1177, "width": 108, "height": 106, "rawWidth": 128, @@ -5309,8 +5309,8 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 1350, - "trimY": 1407, + "trimX": 1415, + "trimY": 1026, "width": 110, "height": 110, "rawWidth": 128, @@ -5352,11 +5352,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 1862, - "trimY": 885, + "trimX": 1705, + "trimY": 544, "width": 116, "height": 98, "rawWidth": 128, @@ -5398,11 +5398,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 0, - "trimX": 1341, - "trimY": 430, + "trimX": 964, + "trimY": 1513, "width": 92, "height": 112, "rawWidth": 128, @@ -5447,8 +5447,8 @@ "rotated": true, "offsetX": -1, "offsetY": 1, - "trimX": 1412, - "trimY": 1088, + "trimX": 1695, + "trimY": 778, "width": 110, "height": 108, "rawWidth": 128, @@ -5490,11 +5490,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 1, - "trimX": 1740, - "trimY": 1086, + "trimX": 1485, + "trimY": 1183, "width": 110, "height": 108, "rawWidth": 128, @@ -5536,11 +5536,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1628, - "trimY": 977, + "trimX": 1705, + "trimY": 662, "width": 114, "height": 98, "rawWidth": 128, @@ -5585,8 +5585,8 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 1549, - "trimY": 402, + "trimX": 1569, + "trimY": 428, "width": 114, "height": 116, "rawWidth": 128, @@ -5628,11 +5628,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 688, - "trimY": 1408, + "trimX": 1923, + "trimY": 749, "width": 118, "height": 100, "rawWidth": 128, @@ -5674,11 +5674,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1509, - "trimY": 750, + "trimX": 1719, + "trimY": 312, "width": 116, "height": 108, "rawWidth": 128, @@ -5720,11 +5720,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -1, "offsetY": 1, - "trimX": 1316, - "trimY": 184, + "trimX": 595, + "trimY": 709, "width": 122, "height": 118, "rawWidth": 128, @@ -5766,11 +5766,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1642, - "trimY": 649, + "trimX": 958, + "trimY": 1385, "width": 100, "height": 126, "rawWidth": 128, @@ -5815,8 +5815,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1770, - "trimY": 374, + "trimX": 1162, + "trimY": 1374, "width": 100, "height": 126, "rawWidth": 128, @@ -5861,8 +5861,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1770, - "trimY": 502, + "trimX": 1264, + "trimY": 1367, "width": 100, "height": 126, "rawWidth": 128, @@ -5907,8 +5907,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 556, - "trimY": 1212, + "trimX": 1054, + "trimY": 390, "width": 128, "height": 104, "rawWidth": 128, @@ -5950,11 +5950,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1770, - "trimY": 750, + "trimX": 1927, + "trimY": 543, "width": 102, "height": 114, "rawWidth": 128, @@ -5999,8 +5999,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 366, - "trimY": 1408, + "trimX": 1434, + "trimY": 714, "width": 108, "height": 120, "rawWidth": 128, @@ -6045,8 +6045,8 @@ "rotated": false, "offsetX": 0, "offsetY": -3, - "trimX": 1123, - "trimY": 1194, + "trimX": 892, + "trimY": 847, "width": 128, "height": 112, "rawWidth": 128, @@ -6088,11 +6088,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 790, - "trimY": 1408, + "trimX": 1805, + "trimY": 659, "width": 116, "height": 106, "rawWidth": 128, @@ -6137,8 +6137,8 @@ "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1552, - "trimY": 520, + "trimX": 434, + "trimY": 1348, "width": 126, "height": 102, "rawWidth": 128, @@ -6183,8 +6183,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1824, - "trimY": 243, + "trimX": 1805, + "trimY": 545, "width": 116, "height": 112, "rawWidth": 128, @@ -6229,8 +6229,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1874, - "trimY": 605, + "trimX": 1805, + "trimY": 767, "width": 116, "height": 112, "rawWidth": 128, @@ -6275,8 +6275,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1626, - "trimY": 863, + "trimX": 1923, + "trimY": 851, "width": 116, "height": 112, "rawWidth": 128, @@ -6321,8 +6321,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1744, - "trimY": 866, + "trimX": 1805, + "trimY": 881, "width": 116, "height": 112, "rawWidth": 128, @@ -6364,11 +6364,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 898, - "trimY": 1407, + "trimX": 1923, + "trimY": 965, "width": 116, "height": 112, "rawWidth": 128, @@ -6413,8 +6413,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1310, - "trimY": 1089, + "trimX": 856, + "trimY": 1385, "width": 128, "height": 100, "rawWidth": 128, @@ -6459,8 +6459,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 901, - "trimY": 721, + "trimX": 316, + "trimY": 1348, "width": 126, "height": 116, "rawWidth": 128, @@ -6505,8 +6505,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1269, - "trimY": 991, + "trimX": 715, + "trimY": 732, "width": 128, "height": 96, "rawWidth": 128, @@ -6551,8 +6551,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1384, - "trimY": 646, + "trimX": 1152, + "trimY": 863, "width": 128, "height": 96, "rawWidth": 128, @@ -6597,8 +6597,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1837, - "trimY": 145, + "trimX": 1282, + "trimY": 863, "width": 128, "height": 96, "rawWidth": 128, @@ -6643,8 +6643,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1341, - "trimY": 544, + "trimX": 911, + "trimY": 1303, "width": 80, "height": 83, "rawWidth": 80, @@ -6686,11 +6686,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1471, - "trimY": 1296, + "trimX": 996, + "trimY": 1303, "width": 80, "height": 83, "rawWidth": 80, @@ -6735,8 +6735,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1837, - "trimY": 111, + "trimX": 1231, + "trimY": 103, "width": 35, "height": 32, "rawWidth": 35, @@ -6781,8 +6781,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1592, - "trimY": 1485, + "trimX": 478, + "trimY": 1301, "width": 42, "height": 43, "rawWidth": 42, @@ -6824,11 +6824,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1829, - "trimY": 1323, + "trimX": 1824, + "trimY": 1411, "width": 60, "height": 62, "rawWidth": 60, @@ -6870,11 +6870,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1815, - "trimY": 1385, + "trimX": 740, + "trimY": 1429, "width": 33, "height": 34, "rawWidth": 33, @@ -6919,8 +6919,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1893, - "trimY": 1329, + "trimX": 1886, + "trimY": 1413, "width": 60, "height": 62, "rawWidth": 60, @@ -6965,8 +6965,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1850, - "trimY": 1385, + "trimX": 1550, + "trimY": 554, "width": 33, "height": 34, "rawWidth": 33, @@ -7011,8 +7011,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1957, - "trimY": 1329, + "trimX": 1950, + "trimY": 1413, "width": 60, "height": 62, "rawWidth": 60, @@ -7057,8 +7057,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 491, - "trimY": 640, + "trimX": 2005, + "trimY": 59, "width": 33, "height": 34, "rawWidth": 33, @@ -7100,11 +7100,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1253, - "trimY": 1239, + "trimX": 1626, + "trimY": 1490, "width": 67, "height": 75, "rawWidth": 67, @@ -7146,11 +7146,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1624, - "trimY": 1295, + "trimX": 1081, + "trimY": 1302, "width": 57, "height": 79, "rawWidth": 57, @@ -7195,8 +7195,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1553, - "trimY": 1274, + "trimX": 1626, + "trimY": 1411, "width": 77, "height": 69, "rawWidth": 77, @@ -7238,11 +7238,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1857, - "trimY": 1421, + "trimX": 1824, + "trimY": 1475, "width": 60, "height": 62, "rawWidth": 60, @@ -7287,8 +7287,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1885, - "trimY": 1391, + "trimX": 2005, + "trimY": 95, "width": 28, "height": 28, "rawWidth": 28, @@ -7330,11 +7330,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 697, - "trimY": 1, + "trimX": 1, + "trimY": 1101, "width": 361, "height": 44, "rawWidth": 361, @@ -7379,8 +7379,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1992, - "trimY": 605, + "trimX": 1584, + "trimY": 1419, "width": 72, "height": 40, "rawWidth": 72, @@ -7422,11 +7422,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1060, - "trimY": 157, + "trimX": 926, + "trimY": 146, "width": 238, "height": 41, "rawWidth": 238, @@ -7468,11 +7468,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1643, - "trimY": 1, + "trimX": 301, + "trimY": 587, "width": 108, "height": 234, "rawWidth": 108, @@ -7514,11 +7514,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1534, - "trimY": 1481, + "trimX": 2005, + "trimY": 1, "width": 36, "height": 56, "rawWidth": 36, @@ -7563,8 +7563,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 103, - "trimY": 1111, + "trimX": 49, + "trimY": 832, "width": 304, "height": 143, "rawWidth": 304, @@ -7609,8 +7609,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 346, - "trimY": 373, + "trimX": 47, + "trimY": 1138, "width": 304, "height": 143, "rawWidth": 304, @@ -7655,8 +7655,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1846, - "trimY": 1197, + "trimX": 1468, + "trimY": 1295, "width": 124, "height": 82, "rawWidth": 124, @@ -7701,8 +7701,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1930, - "trimY": 1203, + "trimX": 1485, + "trimY": 428, "width": 124, "height": 82, "rawWidth": 124, @@ -7747,8 +7747,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 49, + "trimX": 422, + "trimY": 1, "width": 540, "height": 143, "rawWidth": 540, @@ -7781,6 +7781,52 @@ ], "subMetas": {} }, + "85c63": { + "importer": "sprite-frame", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@85c63", + "displayName": "", + "id": "85c63", + "name": "ToastMessage_Bg_Gray", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1152, + "trimY": 857, + "width": 4, + "height": 32, + "rawWidth": 4, + "rawHeight": 32, + "borderTop": 14, + "borderBottom": 13, + "borderLeft": 1, + "borderRight": 1, + "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": {} + }, "57d74": { "importer": "sprite-frame", "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57d74", @@ -7790,11 +7836,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 822, - "trimY": 1217, + "trimX": 2016, + "trimY": 1181, "width": 105, "height": 10, "rawWidth": 105, @@ -7839,8 +7885,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 214, - "trimY": 1417, + "trimX": 1686, + "trimY": 1295, "width": 111, "height": 16, "rawWidth": 111, @@ -7873,6 +7919,52 @@ ], "subMetas": {} }, + "173d4": { + "importer": "sprite-frame", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@173d4", + "displayName": "", + "id": "173d4", + "name": "Victory", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -1, + "offsetY": -28, + "trimX": 1, + "trimY": 1, + "width": 419, + "height": 402, + "rawWidth": 561, + "rawHeight": 458, + "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": {} + }, "8aff2": { "importer": "sprite-frame", "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@8aff2", @@ -7882,11 +7974,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1055, - "trimY": 344, + "trimX": 590, + "trimY": 569, "width": 138, "height": 123, "rawWidth": 138, @@ -7931,8 +8023,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 248, - "trimY": 1350, + "trimX": 969, + "trimY": 332, "width": 190, "height": 56, "rawWidth": 190, @@ -7974,11 +8066,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, "trimX": 1, - "trimY": 1, + "trimY": 405, "width": 694, "height": 46, "rawWidth": 694, @@ -8023,8 +8115,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 103, - "trimY": 1417, + "trimX": 1286, + "trimY": 1495, "width": 111, "height": 109, "rawWidth": 111, @@ -8066,11 +8158,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1382, - "trimY": 1, + "trimX": 318, + "trimY": 823, "width": 259, "height": 96, "rawWidth": 259, @@ -8115,8 +8207,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1534, - "trimY": 1408, + "trimX": 1704, + "trimY": 1284, "width": 71, "height": 71, "rawWidth": 71, @@ -8158,11 +8250,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 822, - "trimY": 1070, + "trimX": 1683, + "trimY": 255, "width": 55, "height": 145, "rawWidth": 55, @@ -8207,8 +8299,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 879, - "trimY": 1070, + "trimX": 877, + "trimY": 570, "width": 55, "height": 145, "rawWidth": 55, @@ -8250,11 +8342,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 936, - "trimY": 1071, + "trimX": 934, + "trimY": 660, "width": 55, "height": 145, "rawWidth": 55, @@ -8299,8 +8391,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1253, - "trimY": 1092, + "trimX": 756, + "trimY": 1134, "width": 55, "height": 145, "rawWidth": 55, @@ -8342,11 +8434,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1384, - "trimY": 127, + "trimX": 740, + "trimY": 1282, "width": 55, "height": 145, "rawWidth": 55, @@ -8391,8 +8483,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1542, - "trimY": 127, + "trimX": 797, + "trimY": 1281, "width": 55, "height": 145, "rawWidth": 55, @@ -8434,11 +8526,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1599, - "trimY": 227, + "trimX": 799, + "trimY": 1428, "width": 55, "height": 145, "rawWidth": 55, @@ -8483,8 +8575,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1767, - "trimY": 227, + "trimX": 854, + "trimY": 1238, "width": 55, "height": 145, "rawWidth": 55, @@ -8529,8 +8621,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1070, - "trimY": 1308, + "trimX": 1917, + "trimY": 1181, "width": 97, "height": 97, "rawWidth": 97, @@ -8575,8 +8667,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 1478, + "trimX": 1485, + "trimY": 554, "width": 34, "height": 63, "rawWidth": 34, @@ -8621,8 +8713,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1992, - "trimY": 679, + "trimX": 813, + "trimY": 1238, "width": 38, "height": 38, "rawWidth": 38, @@ -8664,11 +8756,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1435, - "trimY": 433, + "trimX": 1397, + "trimY": 1493, "width": 112, "height": 109, "rawWidth": 112, @@ -8710,11 +8802,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 343, - "trimY": 194, + "trimX": 969, + "trimY": 142, "width": 177, "height": 188, "rawWidth": 177, @@ -8756,11 +8848,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 533, - "trimY": 195, + "trimX": 411, + "trimY": 569, "width": 177, "height": 188, "rawWidth": 177, @@ -8802,11 +8894,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 724, - "trimY": 47, + "trimX": 416, + "trimY": 949, "width": 177, "height": 188, "rawWidth": 177, @@ -8851,8 +8943,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 723, - "trimY": 226, + "trimX": 718, + "trimY": 391, "width": 177, "height": 188, "rawWidth": 177, @@ -8894,11 +8986,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 709, - "trimY": 405, + "trimX": 1148, + "trimY": 142, "width": 177, "height": 188, "rawWidth": 177, @@ -8943,8 +9035,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 879, - "trimY": 766, + "trimX": 908, + "trimY": 391, "width": 166, "height": 20, "rawWidth": 166, @@ -8986,11 +9078,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1382, - "trimY": 99, + "trimX": 1489, + "trimY": 104, "width": 212, "height": 26, "rawWidth": 212, @@ -9032,11 +9124,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 253, - "trimY": 376, + "trimX": 1331, + "trimY": 1, "width": 350, "height": 91, "rawWidth": 350, @@ -9081,8 +9173,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1738, - "trimY": 1196, + "trimX": 856, + "trimY": 1515, "width": 106, "height": 91, "rawWidth": 106, @@ -9127,8 +9219,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1553, - "trimY": 1353, + "trimX": 1415, + "trimY": 1138, "width": 67, "height": 53, "rawWidth": 67, @@ -9173,8 +9265,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 663, - "trimY": 1070, + "trimX": 595, + "trimY": 833, "width": 157, "height": 157, "rawWidth": 157, @@ -9216,11 +9308,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 440, - "trimY": 1350, + "trimX": 1357, + "trimY": 1063, "width": 128, "height": 56, "rawWidth": 128, @@ -9265,8 +9357,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1627, - "trimY": 853, + "trimX": 47, + "trimY": 1444, "width": 129, "height": 8, "rawWidth": 129, @@ -9311,8 +9403,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 851, - "trimY": 766, + "trimX": 1533, + "trimY": 104, "width": 191, "height": 26, "rawWidth": 191, @@ -9354,11 +9446,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 841, - "trimY": 746, + "trimX": 1331, + "trimY": 94, "width": 216, "height": 8, "rawWidth": 216, @@ -9400,11 +9492,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 491, - "trimY": 373, + "trimX": 964, + "trimY": 103, "width": 265, "height": 37, "rawWidth": 265, @@ -9449,8 +9541,8 @@ "rotated": false, "offsetX": 369, "offsetY": -236, - "trimX": 1058, - "trimY": 200, + "trimX": 541, + "trimY": 1463, "width": 142, "height": 142, "rawWidth": 1024, @@ -9495,8 +9587,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 899, - "trimY": 405, + "trimX": 2029, + "trimY": 125, "width": 32, "height": 12, "rawWidth": 32, @@ -9541,8 +9633,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 732, - "trimY": 1345, + "trimX": 1704, + "trimY": 1357, "width": 61, "height": 69, "rawWidth": 61, @@ -9587,8 +9679,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1522, - "trimY": 1164, + "trimX": 1701, + "trimY": 1174, "width": 104, "height": 108, "rawWidth": 128, @@ -9633,8 +9725,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 66, - "trimY": 1478, + "trimX": 1651, + "trimY": 670, "width": 32, "height": 32, "rawWidth": 32, @@ -9676,11 +9768,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 2002, - "trimY": 1049, + "trimX": 682, + "trimY": 391, "width": 30, "height": 32, "rawWidth": 32, @@ -9722,11 +9814,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1998, - "trimY": 821, + "trimX": 799, + "trimY": 1575, "width": 30, "height": 32, "rawWidth": 32, @@ -9771,8 +9863,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1994, - "trimY": 719, + "trimX": 1484, + "trimY": 1138, "width": 32, "height": 32, "rawWidth": 32, @@ -9817,8 +9909,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1968, - "trimY": 1049, + "trimX": 1626, + "trimY": 1567, "width": 32, "height": 32, "rawWidth": 32, @@ -9863,8 +9955,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1994, - "trimY": 753, + "trimX": 1888, + "trimY": 1475, "width": 32, "height": 32, "rawWidth": 32, @@ -9909,8 +10001,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1994, - "trimY": 787, + "trimX": 1268, + "trimY": 103, "width": 32, "height": 32, "rawWidth": 32, @@ -9955,8 +10047,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 456, - "trimY": 1163, + "trimX": 1660, + "trimY": 1567, "width": 32, "height": 32, "rawWidth": 32, @@ -10001,8 +10093,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1998, - "trimY": 855, + "trimX": 1888, + "trimY": 1509, "width": 32, "height": 32, "rawWidth": 32, @@ -10047,8 +10139,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1668, - "trimY": 1483, + "trimX": 1651, + "trimY": 704, "width": 32, "height": 32, "rawWidth": 32, @@ -10093,8 +10185,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 954, - "trimY": 1218, + "trimX": 1648, + "trimY": 738, "width": 32, "height": 32, "rawWidth": 32, @@ -10136,11 +10228,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1636, - "trimY": 1479, + "trimX": 1922, + "trimY": 1511, "width": 30, "height": 32, "rawWidth": 32, @@ -10185,8 +10277,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1953, - "trimY": 1427, + "trimX": 1956, + "trimY": 1511, "width": 30, "height": 32, "rawWidth": 32, @@ -10228,11 +10320,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 1, - "trimX": 1942, - "trimY": 269, + "trimX": 1078, + "trimY": 1513, "width": 90, "height": 88, "rawWidth": 96, @@ -10277,8 +10369,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1987, - "trimY": 1393, + "trimX": 1990, + "trimY": 1477, "width": 30, "height": 32, "rawWidth": 32, @@ -10323,8 +10415,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 954, - "trimY": 1252, + "trimX": 1648, + "trimY": 772, "width": 32, "height": 32, "rawWidth": 32, @@ -10369,8 +10461,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1980, - "trimY": 889, + "trimX": 1922, + "trimY": 1477, "width": 32, "height": 32, "rawWidth": 32, @@ -10415,8 +10507,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1980, - "trimY": 923, + "trimX": 1956, + "trimY": 1477, "width": 32, "height": 32, "rawWidth": 32, @@ -10461,8 +10553,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1987, - "trimY": 1427, + "trimX": 1990, + "trimY": 1511, "width": 30, "height": 32, "rawWidth": 32, @@ -10507,8 +10599,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1919, - "trimY": 1391, + "trimX": 1697, + "trimY": 1485, "width": 32, "height": 32, "rawWidth": 32, @@ -10553,8 +10645,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1919, - "trimY": 1459, + "trimX": 1695, + "trimY": 1553, "width": 30, "height": 32, "rawWidth": 32, @@ -10599,8 +10691,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1919, - "trimY": 1425, + "trimX": 1731, + "trimY": 1485, "width": 32, "height": 32, "rawWidth": 32, @@ -10645,8 +10737,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1953, - "trimY": 1393, + "trimX": 1765, + "trimY": 1485, "width": 32, "height": 32, "rawWidth": 32, @@ -10691,8 +10783,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1953, - "trimY": 1459, + "trimX": 1695, + "trimY": 1519, "width": 32, "height": 32, "rawWidth": 32, @@ -10737,8 +10829,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1987, - "trimY": 1461, + "trimX": 1729, + "trimY": 1519, "width": 32, "height": 32, "rawWidth": 32, @@ -10783,8 +10875,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1702, - "trimY": 1485, + "trimX": 1763, + "trimY": 1519, "width": 32, "height": 32, "rawWidth": 32, @@ -10826,11 +10918,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1804, - "trimY": 1485, + "trimX": 1729, + "trimY": 1553, "width": 30, "height": 32, "rawWidth": 32, @@ -10875,8 +10967,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1736, - "trimY": 1485, + "trimX": 1763, + "trimY": 1553, "width": 32, "height": 32, "rawWidth": 32, @@ -10921,8 +11013,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1770, - "trimY": 1485, + "trimX": 1797, + "trimY": 1537, "width": 32, "height": 32, "rawWidth": 32, @@ -10967,8 +11059,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1968, - "trimY": 985, + "trimX": 1905, + "trimY": 1349, "width": 56, "height": 62, "rawWidth": 56, @@ -11010,11 +11102,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1622, - "trimY": 1354, + "trimX": 1763, + "trimY": 1420, "width": 63, "height": 59, "rawWidth": 63, @@ -11059,8 +11151,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 232, - "trimY": 1417, + "trimX": 522, + "trimY": 1301, "width": 35, "height": 14, "rawWidth": 35, @@ -11105,8 +11197,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 825, - "trimY": 746, + "trimX": 1517, + "trimY": 104, "width": 216, "height": 14, "rawWidth": 216, diff --git a/assets/resources/gui/gui.png b/assets/resources/gui/gui.png index ae892179..961be455 100644 Binary files a/assets/resources/gui/gui.png and b/assets/resources/gui/gui.png differ diff --git a/assets/resources/gui/rewards.plist b/assets/resources/gui/rewards.plist index 2c3a914e..78feadf8 100644 --- a/assets/resources/gui/rewards.plist +++ b/assets/resources/gui/rewards.plist @@ -15,7 +15,7 @@ spriteSourceSize {128,128} textureRect - {{131,1},{112,112}} + {{565,1},{112,112}} textureRotated @@ -30,7 +30,7 @@ spriteSourceSize {128,128} textureRect - {{245,1},{112,112}} + {{679,1},{112,112}} textureRotated @@ -45,9 +45,9 @@ spriteSourceSize {128,128} textureRect - {{239,115},{114,98}} + {{335,1},{114,98}} textureRotated - + 5004.Png @@ -60,9 +60,9 @@ spriteSourceSize {128,128} textureRect - {{131,115},{100,106}} + {{1321,1},{100,106}} textureRotated - + 5005.Png @@ -75,9 +75,9 @@ spriteSourceSize {128,128} textureRect - {{355,115},{86,112}} + {{793,1},{86,112}} textureRotated - + 5006.Png @@ -90,7 +90,7 @@ spriteSourceSize {128,128} textureRect - {{1,115},{128,100}} + {{1423,1},{128,100}} textureRotated @@ -105,7 +105,7 @@ spriteSourceSize {128,128} textureRect - {{359,1},{110,108}} + {{881,1},{110,108}} textureRotated @@ -120,7 +120,142 @@ spriteSourceSize {128,128} textureRect - {{1,1},{128,112}} + {{435,1},{128,112}} + textureRotated + + + 5009.Png + + aliases + + spriteOffset + {0,0} + spriteSize + {116,104} + spriteSourceSize + {128,128} + textureRect + {{129,1},{116,104}} + textureRotated + + + 5010.Png + + aliases + + spriteOffset + {-1,1} + spriteSize + {120,98} + spriteSourceSize + {128,128} + textureRect + {{1809,1},{120,98}} + textureRotated + + + 5011.Png + + aliases + + spriteOffset + {0,1} + spriteSize + {124,100} + spriteSourceSize + {128,128} + textureRect + {{1683,1},{124,100}} + textureRotated + + + 5012.Png + + aliases + + spriteOffset + {-1,0} + spriteSize + {116,98} + spriteSourceSize + {128,128} + textureRect + {{235,1},{116,98}} + textureRotated + + + 5013.Png + + aliases + + spriteOffset + {-1,1} + spriteSize + {110,108} + spriteSourceSize + {128,128} + textureRect + {{991,1},{110,108}} + textureRotated + + + 5014.Png + + aliases + + spriteOffset + {-1,1} + spriteSize + {110,108} + spriteSourceSize + {128,128} + textureRect + {{1101,1},{110,108}} + textureRotated + + + 5015.Png + + aliases + + spriteOffset + {-1,1} + spriteSize + {110,108} + spriteSourceSize + {128,128} + textureRect + {{1211,1},{110,108}} + textureRotated + + + 5016.Png + + aliases + + spriteOffset + {0,0} + spriteSize + {128,100} + spriteSourceSize + {128,128} + textureRect + {{1553,1},{128,100}} + textureRotated + + + 5017.Png + + aliases + + spriteOffset + {0,0} + spriteSize + {126,116} + spriteSourceSize + {128,128} + textureRect + {{1,1},{126,116}} textureRotated @@ -136,9 +271,9 @@ realTextureFileName rewards.png size - {468,216} + {1930,118} smartupdate - $TexturePacker:SmartUpdate:b0bd39f818690f9d9ef8f0aa0c2b6c60:d4491bbe273cc2d81788789c914f1afd:e70319c7d19eb0b686a46f7adf4e4b0a$ + $TexturePacker:SmartUpdate:0ea114e31db77a25ac629a5a84810b05:7b64aa068fbf8e1755bf6b6fbdb25a9e:e70319c7d19eb0b686a46f7adf4e4b0a$ textureFileName rewards.png diff --git a/assets/resources/gui/rewards.plist.meta b/assets/resources/gui/rewards.plist.meta index fe623c1c..76ab7cf6 100644 --- a/assets/resources/gui/rewards.plist.meta +++ b/assets/resources/gui/rewards.plist.meta @@ -19,7 +19,7 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 131, + "trimX": 565, "trimY": 1, "width": 112, "height": 112, @@ -65,7 +65,7 @@ "rotated": false, "offsetX": -1, "offsetY": 1, - "trimX": 245, + "trimX": 679, "trimY": 1, "width": 112, "height": 112, @@ -108,11 +108,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 239, - "trimY": 115, + "trimX": 335, + "trimY": 1, "width": 114, "height": 98, "rawWidth": 128, @@ -154,11 +154,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 131, - "trimY": 115, + "trimX": 1321, + "trimY": 1, "width": 100, "height": 106, "rawWidth": 128, @@ -200,11 +200,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 355, - "trimY": 115, + "trimX": 793, + "trimY": 1, "width": 86, "height": 112, "rawWidth": 128, @@ -249,8 +249,8 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1, - "trimY": 115, + "trimX": 1423, + "trimY": 1, "width": 128, "height": 100, "rawWidth": 128, @@ -295,7 +295,7 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 359, + "trimX": 881, "trimY": 1, "width": 110, "height": 108, @@ -341,7 +341,7 @@ "rotated": false, "offsetX": 0, "offsetY": 1, - "trimX": 1, + "trimX": 435, "trimY": 1, "width": 128, "height": 112, @@ -374,6 +374,420 @@ ".json" ], "subMetas": {} + }, + "e8f02": { + "importer": "sprite-frame", + "uuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3@e8f02", + "displayName": "", + "id": "e8f02", + "name": "5009", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 129, + "trimY": 1, + "width": 116, + "height": 104, + "rawWidth": 128, + "rawHeight": 128, + "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": "efd3008b-716f-416a-bf4c-ab5cf1672e60@6c48a", + "atlasUuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "988c4": { + "importer": "sprite-frame", + "uuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3@988c4", + "displayName": "", + "id": "988c4", + "name": "5010", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -1, + "offsetY": 1, + "trimX": 1809, + "trimY": 1, + "width": 120, + "height": 98, + "rawWidth": 128, + "rawHeight": 128, + "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": "efd3008b-716f-416a-bf4c-ab5cf1672e60@6c48a", + "atlasUuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "0a0f7": { + "importer": "sprite-frame", + "uuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3@0a0f7", + "displayName": "", + "id": "0a0f7", + "name": "5011", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 1, + "trimX": 1683, + "trimY": 1, + "width": 124, + "height": 100, + "rawWidth": 128, + "rawHeight": 128, + "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": "efd3008b-716f-416a-bf4c-ab5cf1672e60@6c48a", + "atlasUuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9fe0": { + "importer": "sprite-frame", + "uuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3@f9fe0", + "displayName": "", + "id": "f9fe0", + "name": "5012", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": -1, + "offsetY": 0, + "trimX": 235, + "trimY": 1, + "width": 116, + "height": 98, + "rawWidth": 128, + "rawHeight": 128, + "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": "efd3008b-716f-416a-bf4c-ab5cf1672e60@6c48a", + "atlasUuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "ea994": { + "importer": "sprite-frame", + "uuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3@ea994", + "displayName": "", + "id": "ea994", + "name": "5013", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": -1, + "offsetY": 1, + "trimX": 991, + "trimY": 1, + "width": 110, + "height": 108, + "rawWidth": 128, + "rawHeight": 128, + "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": "efd3008b-716f-416a-bf4c-ab5cf1672e60@6c48a", + "atlasUuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "4df76": { + "importer": "sprite-frame", + "uuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3@4df76", + "displayName": "", + "id": "4df76", + "name": "5014", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": -1, + "offsetY": 1, + "trimX": 1101, + "trimY": 1, + "width": 110, + "height": 108, + "rawWidth": 128, + "rawHeight": 128, + "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": "efd3008b-716f-416a-bf4c-ab5cf1672e60@6c48a", + "atlasUuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "7cece": { + "importer": "sprite-frame", + "uuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3@7cece", + "displayName": "", + "id": "7cece", + "name": "5015", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": -1, + "offsetY": 1, + "trimX": 1211, + "trimY": 1, + "width": 110, + "height": 108, + "rawWidth": 128, + "rawHeight": 128, + "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": "efd3008b-716f-416a-bf4c-ab5cf1672e60@6c48a", + "atlasUuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "7ff41": { + "importer": "sprite-frame", + "uuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3@7ff41", + "displayName": "", + "id": "7ff41", + "name": "5016", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1553, + "trimY": 1, + "width": 128, + "height": 100, + "rawWidth": 128, + "rawHeight": 128, + "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": "efd3008b-716f-416a-bf4c-ab5cf1672e60@6c48a", + "atlasUuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "094d8": { + "importer": "sprite-frame", + "uuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3@094d8", + "displayName": "", + "id": "094d8", + "name": "5017", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 1, + "width": 126, + "height": 116, + "rawWidth": 128, + "rawHeight": 128, + "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": "efd3008b-716f-416a-bf4c-ab5cf1672e60@6c48a", + "atlasUuid": "8de06a84-af95-42b1-ab9b-40701e6b3ed3" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} } }, "userData": { diff --git a/assets/resources/gui/rewards.png b/assets/resources/gui/rewards.png index 5752e447..e33a87e5 100644 Binary files a/assets/resources/gui/rewards.png and b/assets/resources/gui/rewards.png differ diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 2452c253..19198be1 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -46,35 +46,38 @@ "__id__": 480 }, { - "__id__": 523 + "__id__": 562 }, { - "__id__": 557 + "__id__": 602 }, { - "__id__": 563 + "__id__": 608 }, { - "__id__": 571 + "__id__": 616 }, { - "__id__": 585 + "__id__": 630 + }, + { + "__id__": 768 } ], "_active": true, "_components": [ { - "__id__": 723 + "__id__": 854 }, { - "__id__": 725 + "__id__": 856 }, { - "__id__": 727 + "__id__": 858 } ], "_prefab": { - "__id__": 729 + "__id__": 860 }, "_lpos": { "__type__": "cc.Vec3", @@ -11214,16 +11217,19 @@ "_children": [ { "__id__": 481 + }, + { + "__id__": 520 } ], "_active": true, "_components": [ { - "__id__": 520 + "__id__": 559 } ], "_prefab": { - "__id__": 522 + "__id__": 561 }, "_lpos": { "__type__": "cc.Vec3", @@ -11293,7 +11299,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, + "x": -75, "y": 0, "z": 0 }, @@ -12184,6 +12190,936 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "call2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 480 + }, + "_children": [ + { + "__id__": 521 + }, + { + "__id__": 527 + }, + { + "__id__": 533 + }, + { + "__id__": 539 + }, + { + "__id__": 545 + } + ], + "_active": true, + "_components": [ + { + "__id__": 553 + }, + { + "__id__": 555 + } + ], + "_prefab": { + "__id__": 558 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 75, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "BubbleFrame01_Hexagon_Bg_Blue", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 520 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 522 + }, + { + "__id__": 524 + } + ], + "_prefab": { + "__id__": 526 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 57.202, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.7, + "y": 0.7, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 521 + }, + "_enabled": true, + "__prefab": { + "__id__": 523 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 170, + "height": 150 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1aq7jgkURIh4YMqkKaWcJ3" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 521 + }, + "_enabled": true, + "__prefab": { + "__id__": 525 + }, + "_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@bd51c", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a0dP429DNNELidAl0d+Fhy" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8aOl/A44lPWKEgmL3E9+Nk", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "name", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 520 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 528 + }, + { + "__id__": 530 + } + ], + "_prefab": { + "__id__": 532 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 73.783, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1.0000000000000002, + "y": 1.0000000000000002, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 527 + }, + "_enabled": true, + "__prefab": { + "__id__": 529 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 84, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1c1eD0k3hM75bpzu6Ik0bX" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 527 + }, + "_enabled": true, + "__prefab": { + "__id__": 531 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "高级召唤", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c6UTAuuGpAUrSZWNBvZfuQ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "17aKtD5JpNd7A3mbzMfAIR", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "line_bg", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 520 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 534 + }, + { + "__id__": 536 + } + ], + "_prefab": { + "__id__": 538 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 37.996, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 533 + }, + "_enabled": true, + "__prefab": { + "__id__": 535 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 40, + "height": 20 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c6cvsULXhOAbt1AwKttVr4" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 533 + }, + "_enabled": true, + "__prefab": { + "__id__": 537 + }, + "_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@5304c", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c9ZBx6lr1EIrznGBrPSRA6" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b7QC0p855JWq0xSS3fe1s0", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "tb", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 520 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 540 + }, + { + "__id__": 542 + } + ], + "_prefab": { + "__id__": 544 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -14.888, + "y": 38.431, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.4, + "y": 0.4, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 539 + }, + "_enabled": true, + "__prefab": { + "__id__": 541 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 56, + "height": 62 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d9k4ezIKNEgYkoTPCvMo15" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 539 + }, + "_enabled": true, + "__prefab": { + "__id__": 543 + }, + "_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@e7af4", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "12lT4zYKhB54VUU2KGLKA/" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "01KPdYPsBJT7GAA/8xaIq0", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "cost", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 520 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 546 + }, + { + "__id__": 548 + }, + { + "__id__": 550 + } + ], + "_prefab": { + "__id__": 552 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 7.957, + "y": 38.813, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 545 + }, + "_enabled": true, + "__prefab": { + "__id__": 547 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 15.123046875, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1a1+tUiORD/p/mMT4CYrOA" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 545 + }, + "_enabled": true, + "__prefab": { + "__id__": 549 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "9", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6806EIDgBCFo/kJPOj2iEe" + }, + { + "__type__": "545c05XsG9GDJispEGWKvYv", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 545 + }, + "_enabled": true, + "__prefab": { + "__id__": 551 + }, + "templateMode": false, + "watchPath": "data.mission.better_cost", + "labelType": "cc.Label", + "watchPathArr": [], + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "db7eFUYONBgbc9l5GzPuLE" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1a+O3SIYRAVoQL3Yop3Xvi", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 520 + }, + "_enabled": true, + "__prefab": { + "__id__": 554 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "05nJOH8bhLyLzJ0FMHzl1e" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 520 + }, + "_enabled": true, + "__prefab": { + "__id__": 556 + }, + "clickEvents": [ + { + "__id__": 557 + } + ], + "_interactable": true, + "_transition": 3, + "_normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 0.8, + "_target": { + "__id__": 520 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e5MGuB9edLpZ7VXG+QBNXL" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "ee99bEQ89lEtavAHQsY2sba", + "handler": "better_call", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "06u+HKUxNPLrvvMZvFjQ1v", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -12194,7 +13130,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 521 + "__id__": 560 }, "_contentSize": { "__type__": "cc.Size", @@ -12235,29 +13171,29 @@ }, "_children": [ { - "__id__": 524 + "__id__": 563 }, { - "__id__": 530 + "__id__": 575 }, { - "__id__": 536 + "__id__": 581 }, { - "__id__": 542 + "__id__": 587 }, { - "__id__": 548 + "__id__": 593 } ], "_active": true, "_components": [ { - "__id__": 554 + "__id__": 599 } ], "_prefab": { - "__id__": 556 + "__id__": 601 }, "_lpos": { "__type__": "cc.Vec3", @@ -12294,20 +13230,74 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 523 + "__id__": 562 + }, + "_children": [ + { + "__id__": 564 + } + ], + "_active": true, + "_components": [ + { + "__id__": 570 + }, + { + "__id__": 572 + } + ], + "_prefab": { + "__id__": 574 + }, + "_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 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Button_SkillBtn_Dark", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 563 }, "_children": [], "_active": true, "_components": [ { - "__id__": 525 + "__id__": 565 }, { - "__id__": 527 + "__id__": 567 } ], "_prefab": { - "__id__": 529 + "__id__": 569 }, "_lpos": { "__type__": "cc.Vec3", @@ -12344,11 +13334,97 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 524 + "__id__": 564 }, "_enabled": true, "__prefab": { - "__id__": 526 + "__id__": 566 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 96, + "height": 97 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8dID626K1PBImuB4QPUS4B" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 564 + }, + "_enabled": true, + "__prefab": { + "__id__": 568 + }, + "_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@cec89", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 3, + "_fillType": 2, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_fillStart": 0, + "_fillRange": 0.8, + "_isTrimmedMode": true, + "_useGrayscale": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c6QuQrFO5G5YPZ8T+EKzmU" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "feQArjCM5CFKxnoaBLK9JW", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 563 + }, + "_enabled": true, + "__prefab": { + "__id__": 571 }, "_contentSize": { "__type__": "cc.Size", @@ -12372,11 +13448,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 524 + "__id__": 563 }, "_enabled": true, "__prefab": { - "__id__": 528 + "__id__": 573 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12389,7 +13465,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@e7dde", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f37b3", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -12430,20 +13506,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 523 + "__id__": 562 }, "_children": [], "_active": true, "_components": [ { - "__id__": 531 + "__id__": 576 }, { - "__id__": 533 + "__id__": 578 } ], "_prefab": { - "__id__": 535 + "__id__": 580 }, "_lpos": { "__type__": "cc.Vec3", @@ -12480,11 +13556,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 530 + "__id__": 575 }, "_enabled": true, "__prefab": { - "__id__": 532 + "__id__": 577 }, "_contentSize": { "__type__": "cc.Size", @@ -12508,11 +13584,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 530 + "__id__": 575 }, "_enabled": true, "__prefab": { - "__id__": 534 + "__id__": 579 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12525,7 +13601,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@e7dde", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f37b3", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -12566,20 +13642,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 523 + "__id__": 562 }, "_children": [], "_active": true, "_components": [ { - "__id__": 537 + "__id__": 582 }, { - "__id__": 539 + "__id__": 584 } ], "_prefab": { - "__id__": 541 + "__id__": 586 }, "_lpos": { "__type__": "cc.Vec3", @@ -12616,11 +13692,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 536 + "__id__": 581 }, "_enabled": true, "__prefab": { - "__id__": 538 + "__id__": 583 }, "_contentSize": { "__type__": "cc.Size", @@ -12644,11 +13720,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 536 + "__id__": 581 }, "_enabled": true, "__prefab": { - "__id__": 540 + "__id__": 585 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12661,7 +13737,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@e7dde", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f37b3", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -12702,20 +13778,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 523 + "__id__": 562 }, "_children": [], "_active": true, "_components": [ { - "__id__": 543 + "__id__": 588 }, { - "__id__": 545 + "__id__": 590 } ], "_prefab": { - "__id__": 547 + "__id__": 592 }, "_lpos": { "__type__": "cc.Vec3", @@ -12752,11 +13828,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 587 }, "_enabled": true, "__prefab": { - "__id__": 544 + "__id__": 589 }, "_contentSize": { "__type__": "cc.Size", @@ -12780,11 +13856,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 542 + "__id__": 587 }, "_enabled": true, "__prefab": { - "__id__": 546 + "__id__": 591 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12797,7 +13873,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@e7dde", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f37b3", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -12838,20 +13914,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 523 + "__id__": 562 }, "_children": [], "_active": true, "_components": [ { - "__id__": 549 + "__id__": 594 }, { - "__id__": 551 + "__id__": 596 } ], "_prefab": { - "__id__": 553 + "__id__": 598 }, "_lpos": { "__type__": "cc.Vec3", @@ -12888,11 +13964,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 548 + "__id__": 593 }, "_enabled": true, "__prefab": { - "__id__": 550 + "__id__": 595 }, "_contentSize": { "__type__": "cc.Size", @@ -12916,11 +13992,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 548 + "__id__": 593 }, "_enabled": true, "__prefab": { - "__id__": 552 + "__id__": 597 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12933,7 +14009,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@e7dde", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f37b3", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -12974,11 +14050,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 523 + "__id__": 562 }, "_enabled": true, "__prefab": { - "__id__": 555 + "__id__": 600 }, "_contentSize": { "__type__": "cc.Size", @@ -13021,14 +14097,14 @@ "_active": true, "_components": [ { - "__id__": 558 + "__id__": 603 }, { - "__id__": 560 + "__id__": 605 } ], "_prefab": { - "__id__": 562 + "__id__": 607 }, "_lpos": { "__type__": "cc.Vec3", @@ -13065,11 +14141,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 602 }, "_enabled": true, "__prefab": { - "__id__": 559 + "__id__": 604 }, "_contentSize": { "__type__": "cc.Size", @@ -13093,11 +14169,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 557 + "__id__": 602 }, "_enabled": true, "__prefab": { - "__id__": 561 + "__id__": 606 }, "_alignFlags": 12, "_target": null, @@ -13143,14 +14219,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 564 + "__id__": 609 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 563 + "__id__": 608 }, "asset": { "__uuid__": "dc0b56d7-c633-4cd2-a6ff-8fa2d7456d9d", @@ -13158,7 +14234,7 @@ }, "fileId": "5bChJGE9BD55+nIimwyIR0", "instance": { - "__id__": 565 + "__id__": 610 }, "targetOverrides": null }, @@ -13172,16 +14248,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 566 + "__id__": 611 }, { - "__id__": 568 + "__id__": 613 }, { - "__id__": 569 + "__id__": 614 }, { - "__id__": 570 + "__id__": 615 } ], "removedComponents": [] @@ -13189,7 +14265,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 567 + "__id__": 612 }, "propertyPath": [ "_name" @@ -13205,7 +14281,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 567 + "__id__": 612 }, "propertyPath": [ "_lpos" @@ -13220,7 +14296,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 567 + "__id__": 612 }, "propertyPath": [ "_lrot" @@ -13236,7 +14312,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 567 + "__id__": 612 }, "propertyPath": [ "_euler" @@ -13255,14 +14331,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 572 + "__id__": 617 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 571 + "__id__": 616 }, "asset": { "__uuid__": "e9d4aea4-d78a-40ff-9300-ad76fec45cfe", @@ -13270,7 +14346,7 @@ }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", "instance": { - "__id__": 573 + "__id__": 618 }, "targetOverrides": null }, @@ -13284,28 +14360,28 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 574 + "__id__": 619 }, { - "__id__": 576 + "__id__": 621 }, { - "__id__": 577 + "__id__": 622 }, { - "__id__": 578 + "__id__": 623 }, { - "__id__": 579 + "__id__": 624 }, { - "__id__": 581 + "__id__": 626 }, { - "__id__": 582 + "__id__": 627 }, { - "__id__": 584 + "__id__": 629 } ], "removedComponents": [] @@ -13313,7 +14389,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 575 + "__id__": 620 }, "propertyPath": [ "_name" @@ -13329,7 +14405,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 575 + "__id__": 620 }, "propertyPath": [ "_lpos" @@ -13344,7 +14420,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 575 + "__id__": 620 }, "propertyPath": [ "_lrot" @@ -13360,7 +14436,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 575 + "__id__": 620 }, "propertyPath": [ "_euler" @@ -13375,7 +14451,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 580 + "__id__": 625 }, "propertyPath": [ "_left" @@ -13391,7 +14467,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 580 + "__id__": 625 }, "propertyPath": [ "_right" @@ -13401,7 +14477,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 583 + "__id__": 628 }, "propertyPath": [ "_contentSize" @@ -13421,7 +14497,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 575 + "__id__": 620 }, "propertyPath": [ "_active" @@ -13435,14 +14511,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 586 + "__id__": 631 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 585 + "__id__": 630 }, "asset": { "__uuid__": "270afabb-368b-4c40-b302-6f8852fd4c1e", @@ -13450,7 +14526,7 @@ }, "fileId": "c7+NtVRt5F5Ljhxmg6HePL", "instance": { - "__id__": 587 + "__id__": 632 }, "targetOverrides": null }, @@ -13463,48 +14539,48 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 588 + "__id__": 633 }, { - "__id__": 627 + "__id__": 672 }, { - "__id__": 666 + "__id__": 711 } ], "propertyOverrides": [ { - "__id__": 705 + "__id__": 750 }, { - "__id__": 707 + "__id__": 752 }, { - "__id__": 708 + "__id__": 753 }, { - "__id__": 709 + "__id__": 754 }, { - "__id__": 710 + "__id__": 755 }, { - "__id__": 711 + "__id__": 756 }, { - "__id__": 713 + "__id__": 758 }, { - "__id__": 715 + "__id__": 760 }, { - "__id__": 717 + "__id__": 762 }, { - "__id__": 719 + "__id__": 764 }, { - "__id__": 721 + "__id__": 766 } ], "removedComponents": [] @@ -13512,11 +14588,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 589 + "__id__": 634 }, "components": [ { - "__id__": 590 + "__id__": 635 } ] }, @@ -13532,19 +14608,19 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 585 + "__id__": 630 } }, "node": { - "__id__": 591 + "__id__": 636 }, "_enabled": true, "__prefab": { - "__id__": 625 + "__id__": 670 }, "clickEvents": [ { - "__id__": 626 + "__id__": 671 } ], "_interactable": true, @@ -13592,23 +14668,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 592 + "__id__": 637 }, "_children": [], "_active": true, "_components": [ { - "__id__": 620 + "__id__": 665 }, { - "__id__": 622 + "__id__": 667 }, { - "__id__": 590 + "__id__": 635 } ], "_prefab": { - "__id__": 624 + "__id__": 669 }, "_lpos": { "__type__": "cc.Vec3", @@ -13645,33 +14721,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 585 + "__id__": 630 }, "_children": [ { - "__id__": 591 + "__id__": 636 }, { - "__id__": 593 + "__id__": 638 }, { - "__id__": 599 + "__id__": 644 }, { - "__id__": 605 + "__id__": 650 }, { - "__id__": 611 + "__id__": 656 } ], "_active": true, "_components": [ { - "__id__": 617 + "__id__": 662 } ], "_prefab": { - "__id__": 619 + "__id__": 664 }, "_lpos": { "__type__": "cc.Vec3", @@ -13708,20 +14784,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 592 + "__id__": 637 }, "_children": [], "_active": true, "_components": [ { - "__id__": 594 + "__id__": 639 }, { - "__id__": 596 + "__id__": 641 } ], "_prefab": { - "__id__": 598 + "__id__": 643 }, "_lpos": { "__type__": "cc.Vec3", @@ -13758,11 +14834,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 593 + "__id__": 638 }, "_enabled": true, "__prefab": { - "__id__": 595 + "__id__": 640 }, "_contentSize": { "__type__": "cc.Size", @@ -13786,11 +14862,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 593 + "__id__": 638 }, "_enabled": true, "__prefab": { - "__id__": 597 + "__id__": 642 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -13844,20 +14920,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 592 + "__id__": 637 }, "_children": [], "_active": true, "_components": [ { - "__id__": 600 + "__id__": 645 }, { - "__id__": 602 + "__id__": 647 } ], "_prefab": { - "__id__": 604 + "__id__": 649 }, "_lpos": { "__type__": "cc.Vec3", @@ -13894,11 +14970,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 599 + "__id__": 644 }, "_enabled": true, "__prefab": { - "__id__": 601 + "__id__": 646 }, "_contentSize": { "__type__": "cc.Size", @@ -13922,11 +14998,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 599 + "__id__": 644 }, "_enabled": true, "__prefab": { - "__id__": 603 + "__id__": 648 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14003,20 +15079,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 592 + "__id__": 637 }, "_children": [], "_active": true, "_components": [ { - "__id__": 606 + "__id__": 651 }, { - "__id__": 608 + "__id__": 653 } ], "_prefab": { - "__id__": 610 + "__id__": 655 }, "_lpos": { "__type__": "cc.Vec3", @@ -14053,11 +15129,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 605 + "__id__": 650 }, "_enabled": true, "__prefab": { - "__id__": 607 + "__id__": 652 }, "_contentSize": { "__type__": "cc.Size", @@ -14081,11 +15157,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 605 + "__id__": 650 }, "_enabled": true, "__prefab": { - "__id__": 609 + "__id__": 654 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14162,20 +15238,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 592 + "__id__": 637 }, "_children": [], "_active": true, "_components": [ { - "__id__": 612 + "__id__": 657 }, { - "__id__": 614 + "__id__": 659 } ], "_prefab": { - "__id__": 616 + "__id__": 661 }, "_lpos": { "__type__": "cc.Vec3", @@ -14212,11 +15288,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 611 + "__id__": 656 }, "_enabled": true, "__prefab": { - "__id__": 613 + "__id__": 658 }, "_contentSize": { "__type__": "cc.Size", @@ -14240,11 +15316,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 611 + "__id__": 656 }, "_enabled": true, "__prefab": { - "__id__": 615 + "__id__": 660 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14298,11 +15374,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 592 + "__id__": 637 }, "_enabled": true, "__prefab": { - "__id__": 618 + "__id__": 663 }, "_contentSize": { "__type__": "cc.Size", @@ -14339,11 +15415,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 591 + "__id__": 636 }, "_enabled": true, "__prefab": { - "__id__": 621 + "__id__": 666 }, "_contentSize": { "__type__": "cc.Size", @@ -14367,11 +15443,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 591 + "__id__": 636 }, "_enabled": true, "__prefab": { - "__id__": 623 + "__id__": 668 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14436,11 +15512,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 628 + "__id__": 673 }, "components": [ { - "__id__": 629 + "__id__": 674 } ] }, @@ -14456,19 +15532,19 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 585 + "__id__": 630 } }, "node": { - "__id__": 630 + "__id__": 675 }, "_enabled": true, "__prefab": { - "__id__": 664 + "__id__": 709 }, "clickEvents": [ { - "__id__": 665 + "__id__": 710 } ], "_interactable": true, @@ -14516,23 +15592,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 631 + "__id__": 676 }, "_children": [], "_active": true, "_components": [ { - "__id__": 659 + "__id__": 704 }, { - "__id__": 661 + "__id__": 706 }, { - "__id__": 629 + "__id__": 674 } ], "_prefab": { - "__id__": 663 + "__id__": 708 }, "_lpos": { "__type__": "cc.Vec3", @@ -14569,33 +15645,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 585 + "__id__": 630 }, "_children": [ { - "__id__": 630 + "__id__": 675 }, { - "__id__": 632 + "__id__": 677 }, { - "__id__": 638 + "__id__": 683 }, { - "__id__": 644 + "__id__": 689 }, { - "__id__": 650 + "__id__": 695 } ], "_active": true, "_components": [ { - "__id__": 656 + "__id__": 701 } ], "_prefab": { - "__id__": 658 + "__id__": 703 }, "_lpos": { "__type__": "cc.Vec3", @@ -14632,20 +15708,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 631 + "__id__": 676 }, "_children": [], "_active": true, "_components": [ { - "__id__": 633 + "__id__": 678 }, { - "__id__": 635 + "__id__": 680 } ], "_prefab": { - "__id__": 637 + "__id__": 682 }, "_lpos": { "__type__": "cc.Vec3", @@ -14682,11 +15758,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 632 + "__id__": 677 }, "_enabled": true, "__prefab": { - "__id__": 634 + "__id__": 679 }, "_contentSize": { "__type__": "cc.Size", @@ -14710,11 +15786,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 632 + "__id__": 677 }, "_enabled": true, "__prefab": { - "__id__": 636 + "__id__": 681 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14768,20 +15844,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 631 + "__id__": 676 }, "_children": [], "_active": true, "_components": [ { - "__id__": 639 + "__id__": 684 }, { - "__id__": 641 + "__id__": 686 } ], "_prefab": { - "__id__": 643 + "__id__": 688 }, "_lpos": { "__type__": "cc.Vec3", @@ -14818,11 +15894,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 638 + "__id__": 683 }, "_enabled": true, "__prefab": { - "__id__": 640 + "__id__": 685 }, "_contentSize": { "__type__": "cc.Size", @@ -14846,11 +15922,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 638 + "__id__": 683 }, "_enabled": true, "__prefab": { - "__id__": 642 + "__id__": 687 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -14927,20 +16003,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 631 + "__id__": 676 }, "_children": [], "_active": true, "_components": [ { - "__id__": 645 + "__id__": 690 }, { - "__id__": 647 + "__id__": 692 } ], "_prefab": { - "__id__": 649 + "__id__": 694 }, "_lpos": { "__type__": "cc.Vec3", @@ -14977,11 +16053,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 644 + "__id__": 689 }, "_enabled": true, "__prefab": { - "__id__": 646 + "__id__": 691 }, "_contentSize": { "__type__": "cc.Size", @@ -15005,11 +16081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 644 + "__id__": 689 }, "_enabled": true, "__prefab": { - "__id__": 648 + "__id__": 693 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15086,20 +16162,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 631 + "__id__": 676 }, "_children": [], "_active": true, "_components": [ { - "__id__": 651 + "__id__": 696 }, { - "__id__": 653 + "__id__": 698 } ], "_prefab": { - "__id__": 655 + "__id__": 700 }, "_lpos": { "__type__": "cc.Vec3", @@ -15136,11 +16212,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 650 + "__id__": 695 }, "_enabled": true, "__prefab": { - "__id__": 652 + "__id__": 697 }, "_contentSize": { "__type__": "cc.Size", @@ -15164,11 +16240,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 650 + "__id__": 695 }, "_enabled": true, "__prefab": { - "__id__": 654 + "__id__": 699 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15222,11 +16298,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 631 + "__id__": 676 }, "_enabled": true, "__prefab": { - "__id__": 657 + "__id__": 702 }, "_contentSize": { "__type__": "cc.Size", @@ -15263,11 +16339,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 630 + "__id__": 675 }, "_enabled": true, "__prefab": { - "__id__": 660 + "__id__": 705 }, "_contentSize": { "__type__": "cc.Size", @@ -15291,11 +16367,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 630 + "__id__": 675 }, "_enabled": true, "__prefab": { - "__id__": 662 + "__id__": 707 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15360,11 +16436,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 667 + "__id__": 712 }, "components": [ { - "__id__": 668 + "__id__": 713 } ] }, @@ -15380,19 +16456,19 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 585 + "__id__": 630 } }, "node": { - "__id__": 669 + "__id__": 714 }, "_enabled": true, "__prefab": { - "__id__": 703 + "__id__": 748 }, "clickEvents": [ { - "__id__": 704 + "__id__": 749 } ], "_interactable": true, @@ -15440,23 +16516,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 670 + "__id__": 715 }, "_children": [], "_active": true, "_components": [ { - "__id__": 698 + "__id__": 743 }, { - "__id__": 700 + "__id__": 745 }, { - "__id__": 668 + "__id__": 713 } ], "_prefab": { - "__id__": 702 + "__id__": 747 }, "_lpos": { "__type__": "cc.Vec3", @@ -15493,33 +16569,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 585 + "__id__": 630 }, "_children": [ { - "__id__": 669 + "__id__": 714 }, { - "__id__": 671 + "__id__": 716 }, { - "__id__": 677 + "__id__": 722 }, { - "__id__": 683 + "__id__": 728 }, { - "__id__": 689 + "__id__": 734 } ], "_active": true, "_components": [ { - "__id__": 695 + "__id__": 740 } ], "_prefab": { - "__id__": 697 + "__id__": 742 }, "_lpos": { "__type__": "cc.Vec3", @@ -15556,20 +16632,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 670 + "__id__": 715 }, "_children": [], "_active": true, "_components": [ { - "__id__": 672 + "__id__": 717 }, { - "__id__": 674 + "__id__": 719 } ], "_prefab": { - "__id__": 676 + "__id__": 721 }, "_lpos": { "__type__": "cc.Vec3", @@ -15606,11 +16682,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 671 + "__id__": 716 }, "_enabled": true, "__prefab": { - "__id__": 673 + "__id__": 718 }, "_contentSize": { "__type__": "cc.Size", @@ -15634,11 +16710,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 671 + "__id__": 716 }, "_enabled": true, "__prefab": { - "__id__": 675 + "__id__": 720 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15692,20 +16768,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 670 + "__id__": 715 }, "_children": [], "_active": true, "_components": [ { - "__id__": 678 + "__id__": 723 }, { - "__id__": 680 + "__id__": 725 } ], "_prefab": { - "__id__": 682 + "__id__": 727 }, "_lpos": { "__type__": "cc.Vec3", @@ -15742,11 +16818,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 677 + "__id__": 722 }, "_enabled": true, "__prefab": { - "__id__": 679 + "__id__": 724 }, "_contentSize": { "__type__": "cc.Size", @@ -15770,11 +16846,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 677 + "__id__": 722 }, "_enabled": true, "__prefab": { - "__id__": 681 + "__id__": 726 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -15851,20 +16927,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 670 + "__id__": 715 }, "_children": [], "_active": true, "_components": [ { - "__id__": 684 + "__id__": 729 }, { - "__id__": 686 + "__id__": 731 } ], "_prefab": { - "__id__": 688 + "__id__": 733 }, "_lpos": { "__type__": "cc.Vec3", @@ -15901,11 +16977,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 683 + "__id__": 728 }, "_enabled": true, "__prefab": { - "__id__": 685 + "__id__": 730 }, "_contentSize": { "__type__": "cc.Size", @@ -15929,11 +17005,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 683 + "__id__": 728 }, "_enabled": true, "__prefab": { - "__id__": 687 + "__id__": 732 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16010,20 +17086,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 670 + "__id__": 715 }, "_children": [], "_active": true, "_components": [ { - "__id__": 690 + "__id__": 735 }, { - "__id__": 692 + "__id__": 737 } ], "_prefab": { - "__id__": 694 + "__id__": 739 }, "_lpos": { "__type__": "cc.Vec3", @@ -16060,11 +17136,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 689 + "__id__": 734 }, "_enabled": true, "__prefab": { - "__id__": 691 + "__id__": 736 }, "_contentSize": { "__type__": "cc.Size", @@ -16088,11 +17164,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 689 + "__id__": 734 }, "_enabled": true, "__prefab": { - "__id__": 693 + "__id__": 738 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16146,11 +17222,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 670 + "__id__": 715 }, "_enabled": true, "__prefab": { - "__id__": 696 + "__id__": 741 }, "_contentSize": { "__type__": "cc.Size", @@ -16187,11 +17263,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 669 + "__id__": 714 }, "_enabled": true, "__prefab": { - "__id__": 699 + "__id__": 744 }, "_contentSize": { "__type__": "cc.Size", @@ -16215,11 +17291,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 669 + "__id__": 714 }, "_enabled": true, "__prefab": { - "__id__": 701 + "__id__": 746 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -16284,7 +17360,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 706 + "__id__": 751 }, "propertyPath": [ "_name" @@ -16300,7 +17376,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 706 + "__id__": 751 }, "propertyPath": [ "_lpos" @@ -16315,7 +17391,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 706 + "__id__": 751 }, "propertyPath": [ "_lrot" @@ -16331,7 +17407,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 706 + "__id__": 751 }, "propertyPath": [ "_euler" @@ -16346,7 +17422,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 706 + "__id__": 751 }, "propertyPath": [ "_active" @@ -16356,7 +17432,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 712 + "__id__": 757 }, "propertyPath": [ "_contentSize" @@ -16376,7 +17452,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 714 + "__id__": 759 }, "propertyPath": [ "_contentSize" @@ -16396,7 +17472,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 716 + "__id__": 761 }, "propertyPath": [ "_contentSize" @@ -16416,7 +17492,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 718 + "__id__": 763 }, "propertyPath": [ "_lscale" @@ -16437,7 +17513,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 720 + "__id__": 765 }, "propertyPath": [ "_lscale" @@ -16458,7 +17534,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 722 + "__id__": 767 }, "propertyPath": [ "_lscale" @@ -16476,6 +17552,2094 @@ "b46Nou7txDzatiWH6pG7pv" ] }, + { + "__type__": "cc.Node", + "_name": "Victory", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 769 + }, + { + "__id__": 775 + }, + { + "__id__": 781 + }, + { + "__id__": 795 + }, + { + "__id__": 813 + }, + { + "__id__": 831 + } + ], + "_active": false, + "_components": [ + { + "__id__": 849 + }, + { + "__id__": 851 + } + ], + "_prefab": { + "__id__": 853 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 360, + "y": 640, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Screen Dimmed", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 768 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 770 + }, + { + "__id__": 772 + } + ], + "_prefab": { + "__id__": 774 + }, + "_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 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 769 + }, + "_enabled": true, + "__prefab": { + "__id__": 771 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 900, + "height": 2000 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7c4hp32T9Ip6G80MuuhbW8" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 769 + }, + "_enabled": true, + "__prefab": { + "__id__": 773 + }, + "_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@ab806", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "feYLB4c5lHH6iTt0lwnYiK" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "5bGQtqeHdKKblZUCYha8gm", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Victory", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 768 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 776 + }, + { + "__id__": 778 + } + ], + "_prefab": { + "__id__": 780 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 200, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 775 + }, + "_enabled": true, + "__prefab": { + "__id__": 777 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 419, + "height": 402 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4eAXBjwupIVaU5Fo/0/r/k" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 775 + }, + "_enabled": true, + "__prefab": { + "__id__": 779 + }, + "_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@173d4", + "__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": "20eux0lo9BT7tFke+s58PY" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2fiOLWZe1GeZYuO+LAR1b0", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Button", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 768 + }, + "_children": [ + { + "__id__": 782 + } + ], + "_active": true, + "_components": [ + { + "__id__": 788 + }, + { + "__id__": 790 + }, + { + "__id__": 792 + } + ], + "_prefab": { + "__id__": 794 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -7.583000000000027, + "y": -322, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 781 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 783 + }, + { + "__id__": 785 + } + ], + "_prefab": { + "__id__": 787 + }, + "_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 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 782 + }, + "_enabled": true, + "__prefab": { + "__id__": 784 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 106.2265625, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8eioPbB7ZCXr9iITut+pvD" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 782 + }, + "_enabled": true, + "__prefab": { + "__id__": 786 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "领 取", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 40, + "_fontSize": 40, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "93OpeL/whNOYcY0SyXduMZ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a8HiC995lJIYym1nYSVjBq", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 781 + }, + "_enabled": true, + "__prefab": { + "__id__": 789 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 114 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2eUkxd1DhA2Jsf6PNvdQIo" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 781 + }, + "_enabled": true, + "__prefab": { + "__id__": 791 + }, + "_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@946c8", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a9RjzTv+1AD5VdEY30wdZI" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 781 + }, + "_enabled": true, + "__prefab": { + "__id__": 793 + }, + "clickEvents": [], + "_interactable": true, + "_transition": 3, + "_normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 8, + "_target": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "79cQ/5y89BxrBNBp2gYc6H" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "25CRS3X+JBPp1duXvGaZTe", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "item1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 768 + }, + "_children": [ + { + "__id__": 796 + }, + { + "__id__": 802 + } + ], + "_active": true, + "_components": [ + { + "__id__": 808 + }, + { + "__id__": 810 + } + ], + "_prefab": { + "__id__": 812 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -150, + "y": -105.307, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "5004", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 795 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 797 + }, + { + "__id__": 799 + } + ], + "_prefab": { + "__id__": 801 + }, + "_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 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 796 + }, + "_enabled": true, + "__prefab": { + "__id__": 798 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 106 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "98PZwtwF9M8ZPzLKCw1NlR" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 796 + }, + "_enabled": true, + "__prefab": { + "__id__": 800 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "8de06a84-af95-42b1-ab9b-40701e6b3ed3@316bf", + "__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": "5cvwtjXIxP1qNUXXqE44Jc" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "3feOZELURPlqaruAqV6nW/", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "num", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 795 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 803 + }, + { + "__id__": 805 + } + ], + "_prefab": { + "__id__": 807 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 24.096, + "y": -35.17, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 802 + }, + "_enabled": true, + "__prefab": { + "__id__": 804 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 59.615234375, + "height": 35.5 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b7NMWTEVBKGbzZ0GOKymY0" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 802 + }, + "_enabled": true, + "__prefab": { + "__id__": 806 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "3000", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 25, + "_fontSize": 25, + "_fontFamily": "Arial", + "_lineHeight": 25, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cd1c4WgtFNOae8cNuyk0Eh" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "efDjkoavFAUaoJxmg/pAgM", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 795 + }, + "_enabled": true, + "__prefab": { + "__id__": 809 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 128, + "height": 130 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0c5BAtrFNEUJxnnPXrBM8y" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 795 + }, + "_enabled": true, + "__prefab": { + "__id__": 811 + }, + "_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@eeece", + "__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": "fexhBzYQ5IdrkVT1IqM/Ob" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "47PQ+pU9ZOGYZESatwufUx", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "item2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 768 + }, + "_children": [ + { + "__id__": 814 + }, + { + "__id__": 820 + } + ], + "_active": true, + "_components": [ + { + "__id__": 826 + }, + { + "__id__": 828 + } + ], + "_prefab": { + "__id__": 830 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -105.307, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "5005", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 813 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 815 + }, + { + "__id__": 817 + } + ], + "_prefab": { + "__id__": 819 + }, + "_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 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 814 + }, + "_enabled": true, + "__prefab": { + "__id__": 816 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 86, + "height": 112 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c6sVWGBDtMXp1f/2YF+DgI" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 814 + }, + "_enabled": true, + "__prefab": { + "__id__": 818 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "8de06a84-af95-42b1-ab9b-40701e6b3ed3@12d7e", + "__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": "6diFH3ps1EMoV6E4y8N/5e" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f06r79sddEn7F7O5BdhKof", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "num", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 813 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 821 + }, + { + "__id__": 823 + } + ], + "_prefab": { + "__id__": 825 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 24.096, + "y": -35.17, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 820 + }, + "_enabled": true, + "__prefab": { + "__id__": 822 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 59.615234375, + "height": 35.5 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d9sTAWQm1EeLAfEM+V8piA" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 820 + }, + "_enabled": true, + "__prefab": { + "__id__": 824 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "3000", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 25, + "_fontSize": 25, + "_fontFamily": "Arial", + "_lineHeight": 25, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d7HrMGw+NONoUsTyomQLF1" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d8S5EKgqNIQpiIRvBD7Vs7", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 813 + }, + "_enabled": true, + "__prefab": { + "__id__": 827 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 128, + "height": 130 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "37hAMKycVEQ7iM1aWTyUzb" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 813 + }, + "_enabled": true, + "__prefab": { + "__id__": 829 + }, + "_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@eeece", + "__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": "56xnVvK2RHToIy7S5gH2GV" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "6fu8BN2qRFRqSWICqG+drk", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "item3", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 768 + }, + "_children": [ + { + "__id__": 832 + }, + { + "__id__": 838 + } + ], + "_active": true, + "_components": [ + { + "__id__": 844 + }, + { + "__id__": 846 + } + ], + "_prefab": { + "__id__": 848 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 150, + "y": -105.307, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "5012", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 831 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 833 + }, + { + "__id__": 835 + } + ], + "_prefab": { + "__id__": 837 + }, + "_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 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 832 + }, + "_enabled": true, + "__prefab": { + "__id__": 834 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 116, + "height": 98 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "dadEUKBZhMaaMzzDg+NcMZ" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 832 + }, + "_enabled": true, + "__prefab": { + "__id__": 836 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "8de06a84-af95-42b1-ab9b-40701e6b3ed3@f9fe0", + "__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": "e4uXd0UCBKZo2RhTfkPdej" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2bCV/k8sBLKrf/FmZbbBjU", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "num", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 831 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 839 + }, + { + "__id__": 841 + } + ], + "_prefab": { + "__id__": 843 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 24.096, + "y": -35.17, + "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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 838 + }, + "_enabled": true, + "__prefab": { + "__id__": 840 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 59.615234375, + "height": 35.5 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5bpqgdsEFIcqzOXAY4dW3o" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 838 + }, + "_enabled": true, + "__prefab": { + "__id__": 842 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "3000", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 25, + "_fontSize": 25, + "_fontFamily": "Arial", + "_lineHeight": 25, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6b4iwGl7dBA5iVCqXHAMdj" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "448ly33H5C+ZYgtiLtbksm", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 831 + }, + "_enabled": true, + "__prefab": { + "__id__": 845 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 128, + "height": 130 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "417TkVz21NjajpCYs23GjL" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 831 + }, + "_enabled": true, + "__prefab": { + "__id__": 847 + }, + "_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@eeece", + "__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": "48nhXyZ5lJ8ZrE2kd0bZxF" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "62jxpnTmlG9ocWRjTtR8x+", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 768 + }, + "_enabled": true, + "__prefab": { + "__id__": 850 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "07t5kWn1ZM85zud9hysKRO" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 768 + }, + "_enabled": true, + "__prefab": { + "__id__": 852 + }, + "_alignFlags": 18, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cdlL6KYKJN2599nT1QtRJm" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1el6EAJ9JL9ruo0tKeStck", + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "GameUI", @@ -16486,7 +19650,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 724 + "__id__": 855 }, "_contentSize": { "__type__": "cc.Size", @@ -16514,7 +19678,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 726 + "__id__": 857 }, "_alignFlags": 45, "_target": null, @@ -16550,7 +19714,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 728 + "__id__": 859 }, "_id": "" }, @@ -16570,21 +19734,21 @@ "instance": null, "targetOverrides": [ { - "__id__": 730 + "__id__": 861 }, { - "__id__": 733 + "__id__": 864 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 585 + "__id__": 630 }, { - "__id__": 571 + "__id__": 616 }, { - "__id__": 563 + "__id__": 608 }, { "__id__": 70 @@ -16597,7 +19761,7 @@ "__id__": 70 }, "sourceInfo": { - "__id__": 731 + "__id__": 862 }, "propertyPath": [ "_target" @@ -16606,7 +19770,7 @@ "__id__": 70 }, "targetInfo": { - "__id__": 732 + "__id__": 863 } }, { @@ -16627,7 +19791,7 @@ "__id__": 70 }, "sourceInfo": { - "__id__": 734 + "__id__": 865 }, "propertyPath": [ "_target" @@ -16636,7 +19800,7 @@ "__id__": 70 }, "targetInfo": { - "__id__": 735 + "__id__": 866 } }, { diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index 8aa73827..022cb773 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -79,9 +79,9 @@ export class SingletonModuleComp extends ecs.Comp { mission:{ once:6, //每波刷新怪物数量 total:120, //总怪物数 - reward:5, //怪物死亡奖励数量 + reward:20, //怪物死亡奖励数量 reward_num:0, //怪物死亡数 - coin:600, + coin:100, coin_add:1, coin_reward_add:1, normal_cost:10, @@ -151,6 +151,9 @@ export class SingletonModuleComp extends ecs.Comp { 15:{bonus:3,lv:0,lv_max:5,info:"技能效果加强",name:""}, 16:{bonus:3,lv:0,lv_max:5,info:"技能持续时间",name:""}, }, + monster:{ + gold_add:1, + }, /** 当前等级 */ cards:{ level:1, diff --git a/assets/script/game/common/config/BoxSet.ts b/assets/script/game/common/config/BoxSet.ts index da72012d..a930eeaa 100644 --- a/assets/script/game/common/config/BoxSet.ts +++ b/assets/script/game/common/config/BoxSet.ts @@ -46,4 +46,7 @@ export enum GameSet { ATK_TO_SHIELD_RATIO=2, ATK_LINES = 3, + MON_GOLD_ADD =2, + MON_COIN_ADD=2, + COIN_ADD=1, } \ No newline at end of file diff --git a/assets/script/game/map/CardController.ts b/assets/script/game/map/CardController.ts index 572e72d0..6c121744 100644 --- a/assets/script/game/map/CardController.ts +++ b/assets/script/game/map/CardController.ts @@ -7,6 +7,7 @@ import { RandomManager } from "../../../../extensions/oops-plugin-framework/asse import { SkillSet } from "../common/config/SkillSet"; import { HeroModelComp } from "../hero/HeroModelComp"; import { RewardSet } from "../common/config/RewardSet"; +import { GameSet } from "../common/config/BoxSet"; const { ccclass, property } = _decorator; /** 视图层对象 */ @@ -75,7 +76,16 @@ export class CardControllerComp extends CCComp { } } - + better_call(){ + if(smc.vm_data.mission.coin >= smc.vm_data.mission.better_cost){ + smc.vm_data.mission.coin -= smc.vm_data.mission.better_cost + oops.message.dispatchEvent("better_call"); + }else{ + oops.gui.toast("铜币不够！"); + + } + } + do_reward(){ smc.vm_data.game_pause = true; @@ -164,7 +174,7 @@ export class CardControllerComp extends CCComp { coin_add(dt: number) { smc.vm_data.gold.time += dt; if (smc.vm_data.gold.time >= smc.vm_data.gold.cd) { - let coin =(smc.vm_data.mission.coin_add*smc.vm_data.mission.coin_reward_add*(1+smc.vm_data.talent[6].bonus*smc.vm_data.talent[6].lv)).toFixed(0) + let coin =(GameSet.COIN_ADD*smc.vm_data.mission.coin_reward_add*(1+smc.vm_data.talent[6].bonus*smc.vm_data.talent[6].lv)).toFixed(0) smc.vm_data.mission.coin += parseFloat(coin) smc.vm_data.gold.time = 0; } diff --git a/assets/script/game/map/MapMonsterComp.ts b/assets/script/game/map/MapMonsterComp.ts index 11b887e5..63b824af 100644 --- a/assets/script/game/map/MapMonsterComp.ts +++ b/assets/script/game/map/MapMonsterComp.ts @@ -55,6 +55,7 @@ export class MapMonsterComp extends CCComp { oops.message.on("other_add_monster", this.on_other_add_monster, this); oops.message.on("do_add_hero", this.on_do_add_hero, this); oops.message.on("normal_call", this.on_normal_call, this); + oops.message.on("better_call", this.on_better_call, this); } start() { @@ -105,6 +106,12 @@ export class MapMonsterComp extends CCComp { let hero:any =RandomManager.instance.getRandomByObjectList(smc.cards, 1); this.addHero(hero[0].uuid) } + on_better_call(){ + let hero:any =RandomManager.instance.getRandomByObjectList(smc.cards, 1); + console.log("better_call:",hero) + this.addHero(hero[0].uuid) + this.addHero(hero[0].uuid) + } monster_refresh(){ if (this.setp_num <= 0){ return diff --git a/assets/script/game/mon/MonViewComp.ts b/assets/script/game/mon/MonViewComp.ts index 892147ac..6c684fd4 100644 --- a/assets/script/game/mon/MonViewComp.ts +++ b/assets/script/game/mon/MonViewComp.ts @@ -432,6 +432,10 @@ export class MonViewComp extends CCComp { var node = instantiate(prefab); node.setPosition(this.node.position.x,this.node.position.y+30,this.node.position.z); node.parent = this.node.parent; + + let coin =(GameSet.MON_COIN_ADD*smc.vm_data.mission.coin_reward_add*(1+smc.vm_data.talent[6].bonus*smc.vm_data.talent[6].lv)).toFixed(0) + smc.vm_data.mission.coin += parseFloat(coin) + } toDestroy(){