diff --git a/assets/Media/Animation/Game/UI/GeneralModal/open.anim b/assets/Media/Animation/Game/UI/GeneralModal/open.anim index 0753d54..88319ea 100644 --- a/assets/Media/Animation/Game/UI/GeneralModal/open.anim +++ b/assets/Media/Animation/Game/UI/GeneralModal/open.anim @@ -114,8 +114,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3333333333333333, - 0.5833333333333334 + 0.3333333432674408, + 0.5833333134651184 ], "_values": [ { @@ -165,8 +165,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3333333333333333, - 0.5833333333333334 + 0.3333333432674408, + 0.5833333134651184 ], "_values": [ { @@ -216,8 +216,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3333333333333333, - 0.5833333333333334 + 0.3333333432674408, + 0.5833333134651184 ], "_values": [ { @@ -267,8 +267,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.3333333333333333, - 0.5833333333333334 + 0.3333333432674408, + 0.5833333134651184 ], "_values": [ { @@ -354,8 +354,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.3333333333333333, - 0.5833333333333334 + 0.3333333432674408, + 0.5833333134651184 ], "_values": [ { @@ -393,15 +393,15 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.3333333333333333, - 0.5833333333333334 + 0.3333333432674408, + 0.5833333134651184 ], "_values": [ { "__type__": "cc.RealKeyframeValue", "interpolationMode": 2, "tangentWeightMode": 2, - "value": -715.794, + "value": -715.7940063476562, "rightTangent": 7360, "rightTangentWeight": 460, "leftTangent": 0, @@ -432,8 +432,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.3333333333333333, - 0.5833333333333334 + 0.3333333432674408, + 0.5833333134651184 ], "_values": [ { @@ -521,9 +521,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.7, - 0.9166666666666666, - 1.0833333333333333 + 0.699999988079071, + 0.9166666865348816, + 1.0833333730697632 ], "_values": [ { @@ -572,11 +572,11 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.55, - 0.7, - 0.7666666666666667, - 0.9166666666666666, - 1.0833333333333333 + 0.550000011920929, + 0.699999988079071, + 0.7666666507720947, + 0.9166666865348816, + 1.0833333730697632 ], "_values": [ { @@ -647,9 +647,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.7, - 0.9166666666666666, - 1.0833333333333333 + 0.699999988079071, + 0.9166666865348816, + 1.0833333730697632 ], "_values": [ { @@ -748,9 +748,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.55, - 0.7, - 0.7666666666666667 + 0.550000011920929, + 0.699999988079071, + 0.7666666507720947 ], "_values": [ { @@ -799,9 +799,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.55, - 0.7, - 0.7666666666666667 + 0.550000011920929, + 0.699999988079071, + 0.7666666507720947 ], "_values": [ { @@ -997,9 +997,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.7666666666666667, - 0.9166666666666666, - 1.0833333333333333 + 0.7666666507720947, + 0.9166666865348816, + 1.0833333730697632 ], "_values": [ { @@ -1048,9 +1048,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.7666666666666667, - 0.9166666666666666, - 1.0833333333333333 + 0.7666666507720947, + 0.9166666865348816, + 1.0833333730697632 ], "_values": [ { @@ -1099,8 +1099,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.9166666666666666, - 1.0833333333333333 + 0.9166666865348816, + 1.0833333730697632 ], "_values": [ { @@ -1201,8 +1201,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 0.8166666666666667, - 1.05 + 0.8166666626930237, + 1.0499999523162842 ], "_values": [ { @@ -1304,7 +1304,7 @@ "__type__": "cc.RealCurve", "_times": [ 1.25, - 1.5833333333333333 + 1.5833333730697632 ], "_values": [ { @@ -1342,9 +1342,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.05, - 1.5666666666666667, - 1.7 + 1.0499999523162842, + 1.5666667222976685, + 1.7000000476837158 ], "_values": [ { @@ -1394,7 +1394,7 @@ "__type__": "cc.RealCurve", "_times": [ 1.25, - 1.5833333333333333 + 1.5833333730697632 ], "_values": [ { @@ -1570,10 +1570,10 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.8833333333333333, - 1.0166666666666666, - 1.1166666666666667, - 1.8166666666666667 + 0.8833333253860474, + 1.0166666507720947, + 1.1166666746139526, + 1.8166667222976685 ], "_values": [ { @@ -1687,7 +1687,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.6 + 1.600000023841858 ], "_values": [ { @@ -1714,7 +1714,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.6 + 1.600000023841858 ], "_values": [ { @@ -1741,7 +1741,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.6 + 1.600000023841858 ], "_values": [ { @@ -1768,8 +1768,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.0666666666666667, - 1.5166666666666666 + 1.0666667222976685, + 1.5166666507720947 ], "_values": [ { @@ -1850,7 +1850,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.1666666666666667 + 1.1666666269302368 ], "_values": [ { @@ -1877,7 +1877,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.1666666666666667 + 1.1666666269302368 ], "_values": [ { @@ -1904,7 +1904,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.1666666666666667 + 1.1666666269302368 ], "_values": [ { @@ -1932,10 +1932,10 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 1.1666666666666667, - 1.8, + 1.1666666269302368, + 1.7999999523162842, 5, - 7.016666666666667 + 7.016666889190674 ], "_values": [ { @@ -2043,7 +2043,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.8166666666666667 + 1.8166667222976685 ], "_values": [ { @@ -2070,9 +2070,9 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.1166666666666667, - 1.6, - 1.8166666666666667 + 1.1166666746139526, + 1.600000023841858, + 1.8166667222976685 ], "_values": [ { @@ -2121,7 +2121,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.8166666666666667 + 1.8166667222976685 ], "_values": [ { @@ -2198,7 +2198,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 7.016666666666667 + 7.016666889190674 ], "_values": [ { @@ -2225,7 +2225,7 @@ { "__type__": "cc.RealCurve", "_times": [ - 7.016666666666667 + 7.016666889190674 ], "_values": [ { @@ -2252,8 +2252,8 @@ { "__type__": "cc.RealCurve", "_times": [ - 1.1666666666666667, - 7.016666666666667 + 1.1666666269302368, + 7.016666889190674 ], "_values": [ { diff --git a/assets/Media/Animation/Game/UI/LevelUpModal/Skill/open.anim b/assets/Media/Animation/Game/UI/LevelUpModal/Skill/open.anim index 1a7d9ab..c43d390 100644 --- a/assets/Media/Animation/Game/UI/LevelUpModal/Skill/open.anim +++ b/assets/Media/Animation/Game/UI/LevelUpModal/Skill/open.anim @@ -11,7 +11,7 @@ "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.5, + "_duration": 0.55, "_hash": 500763545, "_tracks": [ { @@ -75,30 +75,45 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.5 + 0.4, + 0.55 ], "_values": [ { "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, + "interpolationMode": 2, + "tangentWeightMode": 2, "value": -1000, - "rightTangent": 0, - "rightTangentWeight": 1, + "rightTangent": 4627.599999999999, + "rightTangentWeight": 462.7600108048807, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0 }, { "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, + "interpolationMode": 2, + "tangentWeightMode": 3, + "value": 6, + "rightTangent": -3.3333333333333357, + "rightTangentWeight": 0.25056735621385345, + "leftTangent": 228.63636363636394, + "leftTangentWeight": 50.300481111018286, + "easingMethod": 0 + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 2, + "tangentWeightMode": 1, "value": 0, "rightTangent": 0, "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0 + "leftTangent": -3.3333333333333357, + "leftTangentWeight": 0.25056735621385345, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } } ], "preExtrapolation": 1, diff --git a/assets/Media/Fonts/Bitmap.meta b/assets/Media/Fonts/Bitmap.meta new file mode 100644 index 0000000..885ac08 --- /dev/null +++ b/assets/Media/Fonts/Bitmap.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.1.0", + "importer": "directory", + "imported": true, + "uuid": "0116f46e-f248-480c-8aea-f2f53a709e53", + "files": [], + "subMetas": {}, + "userData": { + "compressionType": {}, + "isRemoteBundle": {} + } +} diff --git a/assets/Media/Fonts/Bitmap/bonkfat.fnt b/assets/Media/Fonts/Bitmap/bonkfat.fnt new file mode 100644 index 0000000..43ea828 --- /dev/null +++ b/assets/Media/Fonts/Bitmap/bonkfat.fnt @@ -0,0 +1,117 @@ +info face="Bonk Fatty" size=64 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0 +common lineHeight=64 base=44 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=0 redChnl=4 greenChnl=4 blueChnl=4 +page id=0 file="bonkfat_0.png" +chars count=113 +char id=32 x=252 y=2 width=1 height=1 xoffset=0 yoffset=0 xadvance=21 page=0 chnl=15 +char id=33 x=245 y=60 width=8 height=29 xoffset=0 yoffset=16 xadvance=9 page=0 chnl=15 +char id=34 x=67 y=207 width=19 height=14 xoffset=0 yoffset=18 xadvance=19 page=0 chnl=15 +char id=35 x=46 y=160 width=25 height=24 xoffset=0 yoffset=19 xadvance=25 page=0 chnl=15 +char id=36 x=118 y=0 width=20 height=31 xoffset=0 yoffset=15 xadvance=20 page=0 chnl=15 +char id=37 x=139 y=0 width=40 height=30 xoffset=0 yoffset=16 xadvance=41 page=0 chnl=15 +char id=38 x=51 y=41 width=22 height=29 xoffset=0 yoffset=16 xadvance=23 page=0 chnl=15 +char id=39 x=241 y=171 width=9 height=14 xoffset=-1 yoffset=18 xadvance=8 page=0 chnl=15 +char id=40 x=68 y=0 width=14 height=40 xoffset=0 yoffset=11 xadvance=15 page=0 chnl=15 +char id=41 x=83 y=0 width=14 height=40 xoffset=0 yoffset=11 xadvance=15 page=0 chnl=15 +char id=42 x=50 y=207 width=16 height=15 xoffset=0 yoffset=17 xadvance=17 page=0 chnl=15 +char id=43 x=146 y=159 width=23 height=22 xoffset=0 yoffset=20 xadvance=23 page=0 chnl=15 +char id=44 x=87 y=205 width=8 height=13 xoffset=0 yoffset=38 xadvance=8 page=0 chnl=15 +char id=45 x=170 y=203 width=23 height=10 xoffset=0 yoffset=26 xadvance=24 page=0 chnl=15 +char id=46 x=125 y=92 width=9 height=7 xoffset=0 yoffset=38 xadvance=9 page=0 chnl=15 +char id=47 x=230 y=120 width=16 height=28 xoffset=0 yoffset=17 xadvance=16 page=0 chnl=15 +char id=48 x=42 y=71 width=20 height=29 xoffset=0 yoffset=16 xadvance=20 page=0 chnl=15 +char id=49 x=0 y=160 width=15 height=28 xoffset=0 yoffset=17 xadvance=16 page=0 chnl=15 +char id=50 x=105 y=71 width=19 height=29 xoffset=0 yoffset=16 xadvance=19 page=0 chnl=15 +char id=51 x=194 y=120 width=18 height=28 xoffset=0 yoffset=17 xadvance=18 page=0 chnl=15 +char id=52 x=88 y=130 width=21 height=28 xoffset=0 yoffset=17 xadvance=22 page=0 chnl=15 +char id=53 x=145 y=61 width=19 height=29 xoffset=0 yoffset=16 xadvance=19 page=0 chnl=15 +char id=54 x=44 y=131 width=21 height=28 xoffset=-1 yoffset=17 xadvance=21 page=0 chnl=15 +char id=55 x=22 y=131 width=21 height=28 xoffset=0 yoffset=17 xadvance=21 page=0 chnl=15 +char id=56 x=185 y=61 width=19 height=29 xoffset=0 yoffset=16 xadvance=20 page=0 chnl=15 +char id=57 x=63 y=71 width=20 height=29 xoffset=0 yoffset=16 xadvance=21 page=0 chnl=15 +char id=58 x=232 y=171 width=8 height=20 xoffset=0 yoffset=25 xadvance=8 page=0 chnl=15 +char id=59 x=37 y=160 width=8 height=25 xoffset=0 yoffset=25 xadvance=9 page=0 chnl=15 +char id=60 x=121 y=159 width=24 height=22 xoffset=0 yoffset=20 xadvance=25 page=0 chnl=15 +char id=61 x=74 y=184 width=23 height=20 xoffset=0 yoffset=21 xadvance=24 page=0 chnl=15 +char id=62 x=96 y=159 width=24 height=22 xoffset=0 yoffset=20 xadvance=25 page=0 chnl=15 +char id=63 x=125 y=62 width=19 height=29 xoffset=0 yoffset=16 xadvance=19 page=0 chnl=15 +char id=64 x=180 y=0 width=32 height=30 xoffset=0 yoffset=16 xadvance=33 page=0 chnl=15 +char id=65 x=229 y=30 width=20 height=29 xoffset=0 yoffset=16 xadvance=21 page=0 chnl=15 +char id=66 x=183 y=91 width=22 height=28 xoffset=0 yoffset=17 xadvance=22 page=0 chnl=15 +char id=67 x=160 y=91 width=22 height=28 xoffset=0 yoffset=17 xadvance=22 page=0 chnl=15 +char id=68 x=206 y=91 width=21 height=28 xoffset=0 yoffset=17 xadvance=22 page=0 chnl=15 +char id=69 x=225 y=61 width=19 height=29 xoffset=0 yoffset=16 xadvance=20 page=0 chnl=15 +char id=70 x=165 y=61 width=19 height=29 xoffset=0 yoffset=16 xadvance=20 page=0 chnl=15 +char id=71 x=228 y=91 width=21 height=28 xoffset=0 yoffset=17 xadvance=22 page=0 chnl=15 +char id=72 x=90 y=101 width=23 height=28 xoffset=0 yoffset=17 xadvance=23 page=0 chnl=15 +char id=73 x=247 y=120 width=8 height=28 xoffset=0 yoffset=17 xadvance=9 page=0 chnl=15 +char id=74 x=205 y=61 width=19 height=29 xoffset=0 yoffset=16 xadvance=19 page=0 chnl=15 +char id=75 x=66 y=130 width=21 height=28 xoffset=0 yoffset=17 xadvance=21 page=0 chnl=15 +char id=76 x=19 y=101 width=17 height=29 xoffset=0 yoffset=16 xadvance=17 page=0 chnl=15 +char id=77 x=60 y=101 width=29 height=28 xoffset=0 yoffset=17 xadvance=29 page=0 chnl=15 +char id=78 x=0 y=71 width=20 height=29 xoffset=0 yoffset=16 xadvance=21 page=0 chnl=15 +char id=79 x=163 y=31 width=21 height=29 xoffset=0 yoffset=16 xadvance=22 page=0 chnl=15 +char id=80 x=141 y=31 width=21 height=29 xoffset=0 yoffset=16 xadvance=22 page=0 chnl=15 +char id=81 x=185 y=31 width=21 height=29 xoffset=0 yoffset=16 xadvance=22 page=0 chnl=15 +char id=82 x=119 y=32 width=21 height=29 xoffset=0 yoffset=16 xadvance=22 page=0 chnl=15 +char id=83 x=84 y=71 width=20 height=29 xoffset=0 yoffset=16 xadvance=21 page=0 chnl=15 +char id=84 x=114 y=101 width=22 height=28 xoffset=0 yoffset=17 xadvance=23 page=0 chnl=15 +char id=85 x=0 y=131 width=21 height=28 xoffset=0 yoffset=17 xadvance=22 page=0 chnl=15 +char id=86 x=0 y=41 width=25 height=29 xoffset=0 yoffset=17 xadvance=26 page=0 chnl=15 +char id=87 x=213 y=0 width=35 height=29 xoffset=0 yoffset=17 xadvance=36 page=0 chnl=15 +char id=88 x=137 y=92 width=22 height=28 xoffset=0 yoffset=17 xadvance=23 page=0 chnl=15 +char id=89 x=26 y=41 width=24 height=29 xoffset=0 yoffset=16 xadvance=24 page=0 chnl=15 +char id=90 x=74 y=41 width=22 height=29 xoffset=0 yoffset=16 xadvance=22 page=0 chnl=15 +char id=91 x=52 y=0 width=15 height=40 xoffset=0 yoffset=11 xadvance=15 page=0 chnl=15 +char id=92 x=213 y=120 width=16 height=28 xoffset=0 yoffset=17 xadvance=16 page=0 chnl=15 +char id=93 x=36 y=0 width=15 height=40 xoffset=0 yoffset=11 xadvance=15 page=0 chnl=15 +char id=94 x=0 y=211 width=19 height=16 xoffset=0 yoffset=16 xadvance=19 page=0 chnl=15 +char id=95 x=218 y=192 width=32 height=9 xoffset=0 yoffset=42 xadvance=33 page=0 chnl=15 +char id=96 x=157 y=203 width=12 height=11 xoffset=0 yoffset=18 xadvance=12 page=0 chnl=15 +char id=97 x=211 y=149 width=19 height=21 xoffset=0 yoffset=24 xadvance=19 page=0 chnl=15 +char id=98 x=152 y=121 width=20 height=28 xoffset=0 yoffset=17 xadvance=20 page=0 chnl=15 +char id=99 x=215 y=171 width=16 height=20 xoffset=0 yoffset=25 xadvance=17 page=0 chnl=15 +char id=100 x=110 y=130 width=20 height=28 xoffset=0 yoffset=17 xadvance=20 page=0 chnl=15 +char id=101 x=180 y=172 width=17 height=20 xoffset=0 yoffset=25 xadvance=18 page=0 chnl=15 +char id=102 x=37 y=101 width=14 height=29 xoffset=0 yoffset=16 xadvance=14 page=0 chnl=15 +char id=103 x=97 y=41 width=21 height=29 xoffset=-1 yoffset=24 xadvance=20 page=0 chnl=15 +char id=104 x=131 y=130 width=20 height=28 xoffset=0 yoffset=17 xadvance=20 page=0 chnl=15 +char id=105 x=29 y=160 width=7 height=27 xoffset=0 yoffset=18 xadvance=7 page=0 chnl=15 +char id=106 x=107 y=0 width=10 height=35 xoffset=0 yoffset=18 xadvance=11 page=0 chnl=15 +char id=107 x=0 y=101 width=18 height=29 xoffset=0 yoffset=16 xadvance=19 page=0 chnl=15 +char id=108 x=52 y=101 width=7 height=29 xoffset=0 yoffset=16 xadvance=7 page=0 chnl=15 +char id=109 x=45 y=186 width=28 height=20 xoffset=0 yoffset=25 xadvance=29 page=0 chnl=15 +char id=110 x=191 y=149 width=19 height=21 xoffset=0 yoffset=24 xadvance=19 page=0 chnl=15 +char id=111 x=170 y=150 width=20 height=21 xoffset=0 yoffset=24 xadvance=20 page=0 chnl=15 +char id=112 x=21 y=71 width=20 height=29 xoffset=0 yoffset=24 xadvance=20 page=0 chnl=15 +char id=113 x=207 y=31 width=21 height=29 xoffset=-1 yoffset=24 xadvance=20 page=0 chnl=15 +char id=114 x=0 y=189 width=14 height=21 xoffset=0 yoffset=24 xadvance=15 page=0 chnl=15 +char id=115 x=231 y=149 width=16 height=21 xoffset=0 yoffset=24 xadvance=16 page=0 chnl=15 +char id=116 x=16 y=160 width=12 height=27 xoffset=0 yoffset=18 xadvance=12 page=0 chnl=15 +char id=117 x=120 y=182 width=19 height=20 xoffset=0 yoffset=25 xadvance=19 page=0 chnl=15 +char id=118 x=140 y=182 width=19 height=20 xoffset=0 yoffset=25 xadvance=19 page=0 chnl=15 +char id=119 x=15 y=189 width=29 height=20 xoffset=0 yoffset=25 xadvance=29 page=0 chnl=15 +char id=120 x=198 y=171 width=16 height=20 xoffset=0 yoffset=25 xadvance=17 page=0 chnl=15 +char id=121 x=173 y=120 width=20 height=28 xoffset=0 yoffset=25 xadvance=20 page=0 chnl=15 +char id=122 x=160 y=182 width=19 height=20 xoffset=0 yoffset=25 xadvance=20 page=0 chnl=15 +char id=123 x=18 y=0 width=17 height=40 xoffset=0 yoffset=11 xadvance=18 page=0 chnl=15 +char id=124 x=98 y=0 width=8 height=40 xoffset=0 yoffset=11 xadvance=9 page=0 chnl=15 +char id=125 x=0 y=0 width=17 height=40 xoffset=0 yoffset=11 xadvance=18 page=0 chnl=15 +char id=126 x=20 y=210 width=29 height=15 xoffset=0 yoffset=17 xadvance=29 page=0 chnl=15 +char id=161 x=254 y=2 width=1 height=1 xoffset=0 yoffset=0 xadvance=21 page=0 chnl=15 +char id=162 x=107 y=36 width=1 height=1 xoffset=0 yoffset=0 xadvance=21 page=0 chnl=15 +char id=163 x=107 y=38 width=1 height=1 xoffset=0 yoffset=0 xadvance=21 page=0 chnl=15 +char id=164 x=109 y=36 width=1 height=1 xoffset=0 yoffset=0 xadvance=21 page=0 chnl=15 +char id=165 x=109 y=38 width=1 height=1 xoffset=0 yoffset=0 xadvance=21 page=0 chnl=15 +char id=166 x=111 y=36 width=1 height=1 xoffset=0 yoffset=0 xadvance=21 page=0 chnl=15 +char id=167 x=249 y=0 width=1 height=1 xoffset=0 yoffset=0 xadvance=21 page=0 chnl=15 +char id=168 x=251 y=0 width=1 height=1 xoffset=0 yoffset=0 xadvance=21 page=0 chnl=15 +char id=169 x=253 y=0 width=1 height=1 xoffset=0 yoffset=0 xadvance=21 page=0 chnl=15 +char id=170 x=250 y=2 width=1 height=1 xoffset=0 yoffset=0 xadvance=21 page=0 chnl=15 +char id=215 x=98 y=182 width=21 height=20 xoffset=0 yoffset=21 xadvance=22 page=0 chnl=15 +char id=247 x=72 y=159 width=23 height=24 xoffset=0 yoffset=19 xadvance=24 page=0 chnl=15 +char id=8208 x=194 y=193 width=23 height=10 xoffset=0 yoffset=26 xadvance=24 page=0 chnl=15 +char id=8216 x=138 y=203 width=9 height=12 xoffset=-1 yoffset=18 xadvance=8 page=0 chnl=15 +char id=8217 x=148 y=203 width=8 height=12 xoffset=0 yoffset=18 xadvance=9 page=0 chnl=15 +char id=8220 x=96 y=205 width=20 height=12 xoffset=0 yoffset=18 xadvance=20 page=0 chnl=15 +char id=8221 x=117 y=203 width=20 height=12 xoffset=0 yoffset=18 xadvance=20 page=0 chnl=15 +char id=8222 x=111 y=38 width=1 height=1 xoffset=0 yoffset=0 xadvance=21 page=0 chnl=15 diff --git a/assets/Media/Fonts/Bitmap/bonkfat.fnt.meta b/assets/Media/Fonts/Bitmap/bonkfat.fnt.meta new file mode 100644 index 0000000..3670fcd --- /dev/null +++ b/assets/Media/Fonts/Bitmap/bonkfat.fnt.meta @@ -0,0 +1,1265 @@ +{ + "ver": "1.0.6", + "importer": "bitmap-font", + "imported": true, + "uuid": "65390837-3108-471e-819a-b0be70a7692f", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "_fntConfig": { + "commonHeight": 64, + "fontSize": 64, + "atlasName": "bonkfat_0.png", + "fontDefDictionary": { + "32": { + "rect": { + "x": 252, + "y": 2, + "width": 1, + "height": 1 + }, + "xOffset": 0, + "yOffset": 0, + "xAdvance": 21 + }, + "33": { + "rect": { + "x": 245, + "y": 60, + "width": 8, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 9 + }, + "34": { + "rect": { + "x": 67, + "y": 207, + "width": 19, + "height": 14 + }, + "xOffset": 0, + "yOffset": 18, + "xAdvance": 19 + }, + "35": { + "rect": { + "x": 46, + "y": 160, + "width": 25, + "height": 24 + }, + "xOffset": 0, + "yOffset": 19, + "xAdvance": 25 + }, + "36": { + "rect": { + "x": 118, + "y": 0, + "width": 20, + "height": 31 + }, + "xOffset": 0, + "yOffset": 15, + "xAdvance": 20 + }, + "37": { + "rect": { + "x": 139, + "y": 0, + "width": 40, + "height": 30 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 41 + }, + "38": { + "rect": { + "x": 51, + "y": 41, + "width": 22, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 23 + }, + "39": { + "rect": { + "x": 241, + "y": 171, + "width": 9, + "height": 14 + }, + "xOffset": -1, + "yOffset": 18, + "xAdvance": 8 + }, + "40": { + "rect": { + "x": 68, + "y": 0, + "width": 14, + "height": 40 + }, + "xOffset": 0, + "yOffset": 11, + "xAdvance": 15 + }, + "41": { + "rect": { + "x": 83, + "y": 0, + "width": 14, + "height": 40 + }, + "xOffset": 0, + "yOffset": 11, + "xAdvance": 15 + }, + "42": { + "rect": { + "x": 50, + "y": 207, + "width": 16, + "height": 15 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 17 + }, + "43": { + "rect": { + "x": 146, + "y": 159, + "width": 23, + "height": 22 + }, + "xOffset": 0, + "yOffset": 20, + "xAdvance": 23 + }, + "44": { + "rect": { + "x": 87, + "y": 205, + "width": 8, + "height": 13 + }, + "xOffset": 0, + "yOffset": 38, + "xAdvance": 8 + }, + "45": { + "rect": { + "x": 170, + "y": 203, + "width": 23, + "height": 10 + }, + "xOffset": 0, + "yOffset": 26, + "xAdvance": 24 + }, + "46": { + "rect": { + "x": 125, + "y": 92, + "width": 9, + "height": 7 + }, + "xOffset": 0, + "yOffset": 38, + "xAdvance": 9 + }, + "47": { + "rect": { + "x": 230, + "y": 120, + "width": 16, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 16 + }, + "48": { + "rect": { + "x": 42, + "y": 71, + "width": 20, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 20 + }, + "49": { + "rect": { + "x": 0, + "y": 160, + "width": 15, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 16 + }, + "50": { + "rect": { + "x": 105, + "y": 71, + "width": 19, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 19 + }, + "51": { + "rect": { + "x": 194, + "y": 120, + "width": 18, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 18 + }, + "52": { + "rect": { + "x": 88, + "y": 130, + "width": 21, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 22 + }, + "53": { + "rect": { + "x": 145, + "y": 61, + "width": 19, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 19 + }, + "54": { + "rect": { + "x": 44, + "y": 131, + "width": 21, + "height": 28 + }, + "xOffset": -1, + "yOffset": 17, + "xAdvance": 21 + }, + "55": { + "rect": { + "x": 22, + "y": 131, + "width": 21, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 21 + }, + "56": { + "rect": { + "x": 185, + "y": 61, + "width": 19, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 20 + }, + "57": { + "rect": { + "x": 63, + "y": 71, + "width": 20, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 21 + }, + "58": { + "rect": { + "x": 232, + "y": 171, + "width": 8, + "height": 20 + }, + "xOffset": 0, + "yOffset": 25, + "xAdvance": 8 + }, + "59": { + "rect": { + "x": 37, + "y": 160, + "width": 8, + "height": 25 + }, + "xOffset": 0, + "yOffset": 25, + "xAdvance": 9 + }, + "60": { + "rect": { + "x": 121, + "y": 159, + "width": 24, + "height": 22 + }, + "xOffset": 0, + "yOffset": 20, + "xAdvance": 25 + }, + "61": { + "rect": { + "x": 74, + "y": 184, + "width": 23, + "height": 20 + }, + "xOffset": 0, + "yOffset": 21, + "xAdvance": 24 + }, + "62": { + "rect": { + "x": 96, + "y": 159, + "width": 24, + "height": 22 + }, + "xOffset": 0, + "yOffset": 20, + "xAdvance": 25 + }, + "63": { + "rect": { + "x": 125, + "y": 62, + "width": 19, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 19 + }, + "64": { + "rect": { + "x": 180, + "y": 0, + "width": 32, + "height": 30 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 33 + }, + "65": { + "rect": { + "x": 229, + "y": 30, + "width": 20, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 21 + }, + "66": { + "rect": { + "x": 183, + "y": 91, + "width": 22, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 22 + }, + "67": { + "rect": { + "x": 160, + "y": 91, + "width": 22, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 22 + }, + "68": { + "rect": { + "x": 206, + "y": 91, + "width": 21, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 22 + }, + "69": { + "rect": { + "x": 225, + "y": 61, + "width": 19, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 20 + }, + "70": { + "rect": { + "x": 165, + "y": 61, + "width": 19, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 20 + }, + "71": { + "rect": { + "x": 228, + "y": 91, + "width": 21, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 22 + }, + "72": { + "rect": { + "x": 90, + "y": 101, + "width": 23, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 23 + }, + "73": { + "rect": { + "x": 247, + "y": 120, + "width": 8, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 9 + }, + "74": { + "rect": { + "x": 205, + "y": 61, + "width": 19, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 19 + }, + "75": { + "rect": { + "x": 66, + "y": 130, + "width": 21, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 21 + }, + "76": { + "rect": { + "x": 19, + "y": 101, + "width": 17, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 17 + }, + "77": { + "rect": { + "x": 60, + "y": 101, + "width": 29, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 29 + }, + "78": { + "rect": { + "x": 0, + "y": 71, + "width": 20, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 21 + }, + "79": { + "rect": { + "x": 163, + "y": 31, + "width": 21, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 22 + }, + "80": { + "rect": { + "x": 141, + "y": 31, + "width": 21, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 22 + }, + "81": { + "rect": { + "x": 185, + "y": 31, + "width": 21, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 22 + }, + "82": { + "rect": { + "x": 119, + "y": 32, + "width": 21, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 22 + }, + "83": { + "rect": { + "x": 84, + "y": 71, + "width": 20, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 21 + }, + "84": { + "rect": { + "x": 114, + "y": 101, + "width": 22, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 23 + }, + "85": { + "rect": { + "x": 0, + "y": 131, + "width": 21, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 22 + }, + "86": { + "rect": { + "x": 0, + "y": 41, + "width": 25, + "height": 29 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 26 + }, + "87": { + "rect": { + "x": 213, + "y": 0, + "width": 35, + "height": 29 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 36 + }, + "88": { + "rect": { + "x": 137, + "y": 92, + "width": 22, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 23 + }, + "89": { + "rect": { + "x": 26, + "y": 41, + "width": 24, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 24 + }, + "90": { + "rect": { + "x": 74, + "y": 41, + "width": 22, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 22 + }, + "91": { + "rect": { + "x": 52, + "y": 0, + "width": 15, + "height": 40 + }, + "xOffset": 0, + "yOffset": 11, + "xAdvance": 15 + }, + "92": { + "rect": { + "x": 213, + "y": 120, + "width": 16, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 16 + }, + "93": { + "rect": { + "x": 36, + "y": 0, + "width": 15, + "height": 40 + }, + "xOffset": 0, + "yOffset": 11, + "xAdvance": 15 + }, + "94": { + "rect": { + "x": 0, + "y": 211, + "width": 19, + "height": 16 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 19 + }, + "95": { + "rect": { + "x": 218, + "y": 192, + "width": 32, + "height": 9 + }, + "xOffset": 0, + "yOffset": 42, + "xAdvance": 33 + }, + "96": { + "rect": { + "x": 157, + "y": 203, + "width": 12, + "height": 11 + }, + "xOffset": 0, + "yOffset": 18, + "xAdvance": 12 + }, + "97": { + "rect": { + "x": 211, + "y": 149, + "width": 19, + "height": 21 + }, + "xOffset": 0, + "yOffset": 24, + "xAdvance": 19 + }, + "98": { + "rect": { + "x": 152, + "y": 121, + "width": 20, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 20 + }, + "99": { + "rect": { + "x": 215, + "y": 171, + "width": 16, + "height": 20 + }, + "xOffset": 0, + "yOffset": 25, + "xAdvance": 17 + }, + "100": { + "rect": { + "x": 110, + "y": 130, + "width": 20, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 20 + }, + "101": { + "rect": { + "x": 180, + "y": 172, + "width": 17, + "height": 20 + }, + "xOffset": 0, + "yOffset": 25, + "xAdvance": 18 + }, + "102": { + "rect": { + "x": 37, + "y": 101, + "width": 14, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 14 + }, + "103": { + "rect": { + "x": 97, + "y": 41, + "width": 21, + "height": 29 + }, + "xOffset": -1, + "yOffset": 24, + "xAdvance": 20 + }, + "104": { + "rect": { + "x": 131, + "y": 130, + "width": 20, + "height": 28 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 20 + }, + "105": { + "rect": { + "x": 29, + "y": 160, + "width": 7, + "height": 27 + }, + "xOffset": 0, + "yOffset": 18, + "xAdvance": 7 + }, + "106": { + "rect": { + "x": 107, + "y": 0, + "width": 10, + "height": 35 + }, + "xOffset": 0, + "yOffset": 18, + "xAdvance": 11 + }, + "107": { + "rect": { + "x": 0, + "y": 101, + "width": 18, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 19 + }, + "108": { + "rect": { + "x": 52, + "y": 101, + "width": 7, + "height": 29 + }, + "xOffset": 0, + "yOffset": 16, + "xAdvance": 7 + }, + "109": { + "rect": { + "x": 45, + "y": 186, + "width": 28, + "height": 20 + }, + "xOffset": 0, + "yOffset": 25, + "xAdvance": 29 + }, + "110": { + "rect": { + "x": 191, + "y": 149, + "width": 19, + "height": 21 + }, + "xOffset": 0, + "yOffset": 24, + "xAdvance": 19 + }, + "111": { + "rect": { + "x": 170, + "y": 150, + "width": 20, + "height": 21 + }, + "xOffset": 0, + "yOffset": 24, + "xAdvance": 20 + }, + "112": { + "rect": { + "x": 21, + "y": 71, + "width": 20, + "height": 29 + }, + "xOffset": 0, + "yOffset": 24, + "xAdvance": 20 + }, + "113": { + "rect": { + "x": 207, + "y": 31, + "width": 21, + "height": 29 + }, + "xOffset": -1, + "yOffset": 24, + "xAdvance": 20 + }, + "114": { + "rect": { + "x": 0, + "y": 189, + "width": 14, + "height": 21 + }, + "xOffset": 0, + "yOffset": 24, + "xAdvance": 15 + }, + "115": { + "rect": { + "x": 231, + "y": 149, + "width": 16, + "height": 21 + }, + "xOffset": 0, + "yOffset": 24, + "xAdvance": 16 + }, + "116": { + "rect": { + "x": 16, + "y": 160, + "width": 12, + "height": 27 + }, + "xOffset": 0, + "yOffset": 18, + "xAdvance": 12 + }, + "117": { + "rect": { + "x": 120, + "y": 182, + "width": 19, + "height": 20 + }, + "xOffset": 0, + "yOffset": 25, + "xAdvance": 19 + }, + "118": { + "rect": { + "x": 140, + "y": 182, + "width": 19, + "height": 20 + }, + "xOffset": 0, + "yOffset": 25, + "xAdvance": 19 + }, + "119": { + "rect": { + "x": 15, + "y": 189, + "width": 29, + "height": 20 + }, + "xOffset": 0, + "yOffset": 25, + "xAdvance": 29 + }, + "120": { + "rect": { + "x": 198, + "y": 171, + "width": 16, + "height": 20 + }, + "xOffset": 0, + "yOffset": 25, + "xAdvance": 17 + }, + "121": { + "rect": { + "x": 173, + "y": 120, + "width": 20, + "height": 28 + }, + "xOffset": 0, + "yOffset": 25, + "xAdvance": 20 + }, + "122": { + "rect": { + "x": 160, + "y": 182, + "width": 19, + "height": 20 + }, + "xOffset": 0, + "yOffset": 25, + "xAdvance": 20 + }, + "123": { + "rect": { + "x": 18, + "y": 0, + "width": 17, + "height": 40 + }, + "xOffset": 0, + "yOffset": 11, + "xAdvance": 18 + }, + "124": { + "rect": { + "x": 98, + "y": 0, + "width": 8, + "height": 40 + }, + "xOffset": 0, + "yOffset": 11, + "xAdvance": 9 + }, + "125": { + "rect": { + "x": 0, + "y": 0, + "width": 17, + "height": 40 + }, + "xOffset": 0, + "yOffset": 11, + "xAdvance": 18 + }, + "126": { + "rect": { + "x": 20, + "y": 210, + "width": 29, + "height": 15 + }, + "xOffset": 0, + "yOffset": 17, + "xAdvance": 29 + }, + "161": { + "rect": { + "x": 254, + "y": 2, + "width": 1, + "height": 1 + }, + "xOffset": 0, + "yOffset": 0, + "xAdvance": 21 + }, + "162": { + "rect": { + "x": 107, + "y": 36, + "width": 1, + "height": 1 + }, + "xOffset": 0, + "yOffset": 0, + "xAdvance": 21 + }, + "163": { + "rect": { + "x": 107, + "y": 38, + "width": 1, + "height": 1 + }, + "xOffset": 0, + "yOffset": 0, + "xAdvance": 21 + }, + "164": { + "rect": { + "x": 109, + "y": 36, + "width": 1, + "height": 1 + }, + "xOffset": 0, + "yOffset": 0, + "xAdvance": 21 + }, + "165": { + "rect": { + "x": 109, + "y": 38, + "width": 1, + "height": 1 + }, + "xOffset": 0, + "yOffset": 0, + "xAdvance": 21 + }, + "166": { + "rect": { + "x": 111, + "y": 36, + "width": 1, + "height": 1 + }, + "xOffset": 0, + "yOffset": 0, + "xAdvance": 21 + }, + "167": { + "rect": { + "x": 249, + "y": 0, + "width": 1, + "height": 1 + }, + "xOffset": 0, + "yOffset": 0, + "xAdvance": 21 + }, + "168": { + "rect": { + "x": 251, + "y": 0, + "width": 1, + "height": 1 + }, + "xOffset": 0, + "yOffset": 0, + "xAdvance": 21 + }, + "169": { + "rect": { + "x": 253, + "y": 0, + "width": 1, + "height": 1 + }, + "xOffset": 0, + "yOffset": 0, + "xAdvance": 21 + }, + "170": { + "rect": { + "x": 250, + "y": 2, + "width": 1, + "height": 1 + }, + "xOffset": 0, + "yOffset": 0, + "xAdvance": 21 + }, + "215": { + "rect": { + "x": 98, + "y": 182, + "width": 21, + "height": 20 + }, + "xOffset": 0, + "yOffset": 21, + "xAdvance": 22 + }, + "247": { + "rect": { + "x": 72, + "y": 159, + "width": 23, + "height": 24 + }, + "xOffset": 0, + "yOffset": 19, + "xAdvance": 24 + }, + "8208": { + "rect": { + "x": 194, + "y": 193, + "width": 23, + "height": 10 + }, + "xOffset": 0, + "yOffset": 26, + "xAdvance": 24 + }, + "8216": { + "rect": { + "x": 138, + "y": 203, + "width": 9, + "height": 12 + }, + "xOffset": -1, + "yOffset": 18, + "xAdvance": 8 + }, + "8217": { + "rect": { + "x": 148, + "y": 203, + "width": 8, + "height": 12 + }, + "xOffset": 0, + "yOffset": 18, + "xAdvance": 9 + }, + "8220": { + "rect": { + "x": 96, + "y": 205, + "width": 20, + "height": 12 + }, + "xOffset": 0, + "yOffset": 18, + "xAdvance": 20 + }, + "8221": { + "rect": { + "x": 117, + "y": 203, + "width": 20, + "height": 12 + }, + "xOffset": 0, + "yOffset": 18, + "xAdvance": 20 + }, + "8222": { + "rect": { + "x": 111, + "y": 38, + "width": 1, + "height": 1 + }, + "xOffset": 0, + "yOffset": 0, + "xAdvance": 21 + } + }, + "kerningDict": {} + }, + "fontSize": 64, + "textureUuid": "b0d1187d-d2c1-4d7a-9464-c19c8b69abde" + } +} diff --git a/assets/Media/Fonts/Bitmap/bonkfat_0.png b/assets/Media/Fonts/Bitmap/bonkfat_0.png new file mode 100644 index 0000000..b93834a Binary files /dev/null and b/assets/Media/Fonts/Bitmap/bonkfat_0.png differ diff --git a/assets/Media/Fonts/Bitmap/bonkfat_0.png.meta b/assets/Media/Fonts/Bitmap/bonkfat_0.png.meta new file mode 100644 index 0000000..3dcbf09 --- /dev/null +++ b/assets/Media/Fonts/Bitmap/bonkfat_0.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.25", + "importer": "image", + "imported": true, + "uuid": "b0d1187d-d2c1-4d7a-9464-c19c8b69abde", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "b0d1187d-d2c1-4d7a-9464-c19c8b69abde@6c48a", + "displayName": "bonkfat_0", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "b0d1187d-d2c1-4d7a-9464-c19c8b69abde", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "b0d1187d-d2c1-4d7a-9464-c19c8b69abde@f9941", + "displayName": "bonkfat_0", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -0.5, + "offsetY": 14.5, + "trimX": 0, + "trimY": 0, + "width": 255, + "height": 227, + "rawWidth": 256, + "rawHeight": 256, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -127.5, + -113.5, + 0, + 127.5, + -113.5, + 0, + -127.5, + 113.5, + 0, + 127.5, + 113.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 256, + 255, + 256, + 0, + 29, + 255, + 29 + ], + "nuv": [ + 0, + 0.11328125, + 0.99609375, + 0.11328125, + 0, + 1, + 0.99609375, + 1 + ], + "minPos": [ + -127.5, + -113.5, + 0 + ], + "maxPos": [ + 127.5, + 113.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "b0d1187d-d2c1-4d7a-9464-c19c8b69abde@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.11", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": true, + "hasAlpha": true, + "redirect": "b0d1187d-d2c1-4d7a-9464-c19c8b69abde@f9941" + } +} diff --git a/assets/Media/Fonts/Bitmap/bonkfat_0.tga b/assets/Media/Fonts/Bitmap/bonkfat_0.tga new file mode 100644 index 0000000..fa786f2 Binary files /dev/null and b/assets/Media/Fonts/Bitmap/bonkfat_0.tga differ diff --git a/assets/Media/Fonts/Bitmap/bonkfat_0.tga.meta b/assets/Media/Fonts/Bitmap/bonkfat_0.tga.meta new file mode 100644 index 0000000..3a09ac4 --- /dev/null +++ b/assets/Media/Fonts/Bitmap/bonkfat_0.tga.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.25", + "importer": "image", + "imported": true, + "uuid": "6ff9659b-c0c2-4c56-a999-77dde033ded0", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "6ff9659b-c0c2-4c56-a999-77dde033ded0@6c48a", + "displayName": "bonkfat_0", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "6ff9659b-c0c2-4c56-a999-77dde033ded0", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "6ff9659b-c0c2-4c56-a999-77dde033ded0@f9941", + "displayName": "bonkfat_0", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 256, + "height": 256, + "rawWidth": 256, + "rawHeight": 256, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -128, + -128, + 0, + 128, + -128, + 0, + -128, + 128, + 0, + 128, + 128, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 256, + 256, + 256, + 0, + 0, + 256, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -128, + -128, + 0 + ], + "maxPos": [ + 128, + 128, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "6ff9659b-c0c2-4c56-a999-77dde033ded0@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.11", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": true, + "hasAlpha": true, + "redirect": "6ff9659b-c0c2-4c56-a999-77dde033ded0@f9941" + } +} diff --git a/assets/Media/Prefabs/ModalWindows/AudioSettings/AudioSettingsModalWindow.prefab b/assets/Media/Prefabs/ModalWindows/AudioSettings/AudioSettingsModalWindow.prefab index 86b9bfd..5c054d5 100644 --- a/assets/Media/Prefabs/ModalWindows/AudioSettings/AudioSettingsModalWindow.prefab +++ b/assets/Media/Prefabs/ModalWindows/AudioSettings/AudioSettingsModalWindow.prefab @@ -480,7 +480,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -19.18, + "y": -18.332, "z": 0 }, "_lrot": { @@ -492,8 +492,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -518,7 +518,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 138.57, + "width": 256.63, "height": 20 }, "_anchorPoint": { @@ -548,26 +548,26 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 133, - "g": 153, - "b": 177, + "r": 193, + "g": 221, + "b": 253, "a": 255 }, - "_string": "Audio Settings", + "_string": "AUDIO SETTINGS", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 20, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -612,7 +612,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -18.342, + "y": -17.494, "z": 0 }, "_lrot": { @@ -624,8 +624,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -650,7 +650,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 138.57, + "width": 256.63, "height": 20 }, "_anchorPoint": { @@ -680,26 +680,26 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 25, - "g": 29, - "b": 43, + "r": 40, + "g": 57, + "b": 84, "a": 255 }, - "_string": "Audio Settings", + "_string": "AUDIO SETTINGS", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 20, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -1767,8 +1767,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -1793,7 +1793,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 95.43, + "width": 208, "height": 20 }, "_anchorPoint": { @@ -1828,21 +1828,21 @@ "b": 231, "a": 255 }, - "_string": "sound voume", + "_string": "Sound voume", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 16, - "_fontSize": 16, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 20, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -2440,8 +2440,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -2466,7 +2466,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 90.29, + "width": 198.03, "height": 20 }, "_anchorPoint": { @@ -2504,18 +2504,18 @@ "_string": "Music voume", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 16, - "_fontSize": 16, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 20, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -3126,8 +3126,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -3152,7 +3152,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 22.14, + "width": 38.97, "height": 20 }, "_anchorPoint": { @@ -3190,14 +3190,14 @@ "_string": "OK", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 20, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, diff --git a/assets/Media/Prefabs/ModalWindows/Chest/ChestModalWindow.prefab b/assets/Media/Prefabs/ModalWindows/Chest/ChestModalWindow.prefab index cdf16d4..eaa6143 100644 --- a/assets/Media/Prefabs/ModalWindows/Chest/ChestModalWindow.prefab +++ b/assets/Media/Prefabs/ModalWindows/Chest/ChestModalWindow.prefab @@ -1097,7 +1097,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 118.46, + "width": 250, "height": 37.2 }, "_anchorPoint": { @@ -1127,26 +1127,26 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 25, - "g": 29, - "b": 43, + "r": 40, + "g": 57, + "b": 84, "a": 255 }, "_string": "Increase health", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 18, - "_fontSize": 18, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 18, "_overflow": 1, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -2297,7 +2297,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -185.024, + "y": -180.236, "z": 0 }, "_lrot": { @@ -2335,7 +2335,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 117.86, + "width": 250, "height": 36 }, "_anchorPoint": { @@ -2370,21 +2370,21 @@ "b": 192, "a": 255 }, - "_string": "Increase healthwefwef", + "_string": "Increase healthwefwef uiopup", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 12, - "_fontSize": 12, + "_actualFontSize": 38, + "_fontSize": 38, "_fontFamily": "Arial", - "_lineHeight": 12, + "_lineHeight": 18, "_overflow": 1, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, diff --git a/assets/Media/Prefabs/ModalWindows/LevelUp/LevelUpModalWindow.prefab b/assets/Media/Prefabs/ModalWindows/LevelUp/LevelUpModalWindow.prefab index 2f0f11b..15855ea 100644 --- a/assets/Media/Prefabs/ModalWindows/LevelUp/LevelUpModalWindow.prefab +++ b/assets/Media/Prefabs/ModalWindows/LevelUp/LevelUpModalWindow.prefab @@ -184,7 +184,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 700, - "height": 960 + "height": 900 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -309,8 +309,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -346,8 +346,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -415,8 +415,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 640, - "height": 960 + "width": 510, + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Media/Prefabs/ModalWindows/LevelUp/LevelUpSkill.prefab b/assets/Media/Prefabs/ModalWindows/LevelUp/LevelUpSkill.prefab index e0e1bef..689db92 100644 --- a/assets/Media/Prefabs/ModalWindows/LevelUp/LevelUpSkill.prefab +++ b/assets/Media/Prefabs/ModalWindows/LevelUp/LevelUpSkill.prefab @@ -104,7 +104,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -7.74, + "y": -15, "z": 0 }, "_lrot": { @@ -156,7 +156,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 15, + "y": 18, "z": 0 }, "_lrot": { @@ -242,7 +242,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 86, + "width": 84, "height": 28 }, "_anchorPoint": { @@ -405,7 +405,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 78, - "height": 110 + "height": 120 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -495,7 +495,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 51.138, + "y": 51.816, "z": 0 }, "_lrot": { @@ -533,8 +533,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 118.46, - "height": 37.2 + "width": 120, + "height": 36 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -563,26 +563,26 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 25, - "g": 29, - "b": 43, + "r": 40, + "g": 57, + "b": 84, "a": 255 }, - "_string": "Increase health", + "_string": "Regeneration health", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 18, - "_fontSize": 18, + "_actualFontSize": 28, + "_fontSize": 28, "_fontFamily": "Arial", "_lineHeight": 18, "_overflow": 1, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -627,7 +627,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -24.948, + "y": -31.835, "z": 0 }, "_lrot": { @@ -759,7 +759,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -81.138, + "y": -87.083, "z": 0 }, "_lrot": { @@ -797,8 +797,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 117.86, - "height": 36 + "width": 130, + "height": 63.6 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -832,21 +832,21 @@ "b": 192, "a": 255 }, - "_string": "Increase healthwefwef", + "_string": "Increase healthwefwef r678g uiouiouiouio", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 12, - "_fontSize": 12, + "_actualFontSize": 28, + "_fontSize": 28, "_fontFamily": "Arial", - "_lineHeight": 12, + "_lineHeight": 16, "_overflow": 1, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, diff --git a/assets/Media/Prefabs/ModalWindows/Pause/PauseModalWindow.prefab b/assets/Media/Prefabs/ModalWindows/Pause/PauseModalWindow.prefab index 2797288..d5766af 100644 --- a/assets/Media/Prefabs/ModalWindows/Pause/PauseModalWindow.prefab +++ b/assets/Media/Prefabs/ModalWindows/Pause/PauseModalWindow.prefab @@ -498,8 +498,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -524,7 +524,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 56.43, + "width": 97.16, "height": 20 }, "_anchorPoint": { @@ -554,26 +554,26 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 133, - "g": 153, - "b": 177, + "r": 193, + "g": 221, + "b": 253, "a": 255 }, - "_string": "Pause", + "_string": "PAUSE", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 20, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -630,8 +630,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -656,7 +656,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 56.43, + "width": 97.16, "height": 20 }, "_anchorPoint": { @@ -686,26 +686,26 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 25, - "g": 29, - "b": 43, + "r": 40, + "g": 57, + "b": 84, "a": 255 }, - "_string": "Pause", + "_string": "PAUSE", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 20, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -1958,8 +1958,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -1984,7 +1984,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 83.57, + "width": 116.78, "height": 20 }, "_anchorPoint": { @@ -2019,21 +2019,21 @@ "b": 231, "a": 255 }, - "_string": "SETTINGS", + "_string": "Settings", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 20, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -2338,8 +2338,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -2364,7 +2364,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 37.86, + "width": 52.25, "height": 20 }, "_anchorPoint": { @@ -2402,18 +2402,18 @@ "_string": "Exit", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 20, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -2718,8 +2718,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -2744,7 +2744,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 83.57, + "width": 125.84, "height": 20 }, "_anchorPoint": { @@ -2782,18 +2782,18 @@ "_string": "Continue", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 20, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, diff --git a/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradeButton.prefab b/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradeButton.prefab index 460f9f7..2c29305 100644 --- a/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradeButton.prefab +++ b/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradeButton.prefab @@ -64,7 +64,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -160, - "y": -120, + "y": -128, "z": 0 }, "_lrot": { @@ -154,7 +154,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 75, - "height": 118 + "height": 130 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -281,7 +281,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 82.028, + "y": 96.11, "z": 0 }, "_lrot": { @@ -293,7 +293,7 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, + "x": 0.9, "y": 1, "z": 1 }, @@ -319,8 +319,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 129.1, - "height": 40 + "width": 134.3, + "height": 41.1 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -354,21 +354,21 @@ "b": 255, "a": 255 }, - "_string": "label \n123", + "_string": "Label \n123", "_horizontalAlign": 1, - "_verticalAlign": 0, - "_actualFontSize": 20, - "_fontSize": 20, + "_verticalAlign": 1, + "_actualFontSize": 38, + "_fontSize": 38, "_fontFamily": "Century Gothic", - "_lineHeight": 20, + "_lineHeight": 23, "_overflow": 1, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -413,7 +413,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -85.523, + "y": -78.432, "z": 0 }, "_lrot": { @@ -451,8 +451,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 129.6, - "height": 36 + "width": 126.9, + "height": 64.844 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -486,21 +486,21 @@ "b": 255, "a": 198 }, - "_string": "label\n123456\n88", + "_string": "label 123456 88 444 456456t rty rt et 456 4 7897878978989789", "_horizontalAlign": 1, "_verticalAlign": 0, - "_actualFontSize": 12, - "_fontSize": 12, + "_actualFontSize": 28, + "_fontSize": 28, "_fontFamily": "Century Gothic", - "_lineHeight": 12, + "_lineHeight": 16, "_overflow": 1, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 1, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -555,7 +555,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0.106, - "y": -47.511, + "y": -34.315, "z": 0 }, "_lrot": { @@ -782,7 +782,7 @@ ], "value": { "__type__": "cc.Vec3", - "x": -18, + "x": 0, "y": 0, "z": 0 } @@ -906,7 +906,7 @@ ], "value": { "__type__": "cc.Vec3", - "x": 18, + "x": 36, "y": 0, "z": 0 } @@ -1049,7 +1049,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -0.801, - "y": 26.018, + "y": 39.214, "z": 0 }, "_lrot": { @@ -1181,7 +1181,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -23.122, + "y": -9.034, "z": 0 }, "_lrot": { @@ -1219,7 +1219,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 96.43, + "width": 96.03, "height": 18 }, "_anchorPoint": { @@ -1257,18 +1257,18 @@ "_string": "Max level", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 38, + "_fontSize": 38, "_fontFamily": "Century Gothic", "_lineHeight": 18, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -1317,7 +1317,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 1.288, - "y": -23.031, + "y": -9.835, "z": 0 }, "_lrot": { @@ -1487,7 +1487,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 22.14, + "width": 23.06, "height": 18 }, "_anchorPoint": { @@ -1517,26 +1517,26 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 246, - "g": 173, - "b": 59, + "r": 255, + "g": 198, + "b": 17, "a": 255 }, "_string": "30", "_horizontalAlign": 0, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 38, + "_fontSize": 38, "_fontFamily": "Century Gothic", "_lineHeight": 18, "_overflow": 0, "_enableWrapText": false, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -1572,7 +1572,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 150, - "height": 236 + "height": 260 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab b/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab index 43a0369..532927a 100644 --- a/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab +++ b/assets/Media/Prefabs/ModalWindows/Upgrades/UpgradesModalWindow.prefab @@ -25,17 +25,17 @@ "_active": true, "_components": [ { - "__id__": 227 + "__id__": 232 }, { - "__id__": 229 + "__id__": 234 }, { - "__id__": 231 + "__id__": 236 } ], "_prefab": { - "__id__": 233 + "__id__": 238 }, "_lpos": { "__type__": "cc.Vec3", @@ -84,14 +84,14 @@ "_active": true, "_components": [ { - "__id__": 222 + "__id__": 227 }, { - "__id__": 224 + "__id__": 229 } ], "_prefab": { - "__id__": 226 + "__id__": 231 }, "_lpos": { "__type__": "cc.Vec3", @@ -295,11 +295,11 @@ "_active": true, "_components": [ { - "__id__": 219 + "__id__": 224 } ], "_prefab": { - "__id__": 221 + "__id__": 226 }, "_lpos": { "__type__": "cc.Vec3", @@ -371,7 +371,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 318, + "y": 325.761, "z": 0 }, "_lrot": { @@ -492,8 +492,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -518,7 +518,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 90.71, + "width": 158.47, "height": 20 }, "_anchorPoint": { @@ -548,26 +548,26 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 133, - "g": 153, - "b": 177, + "r": 193, + "g": 221, + "b": 253, "a": 255 }, - "_string": "Upgrades", + "_string": "UPGRADES", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 20, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -624,8 +624,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -650,7 +650,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 90.71, + "width": 158.47, "height": 20 }, "_anchorPoint": { @@ -680,26 +680,26 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 25, - "g": 29, - "b": 43, + "r": 40, + "g": 57, + "b": 84, "a": 255 }, - "_string": "Upgrades", + "_string": "UPGRADES", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 20, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -1480,7 +1480,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -313, + "y": -327, "z": 0 }, "_lrot": { @@ -1600,7 +1600,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 250, - "height": 314 + "height": 328 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1882,8 +1882,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -20.788, - "y": 226.72, + "x": -16.912, + "y": 235.924, "z": 0 }, "_lrot": { @@ -1930,7 +1930,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 12.719, + "x": 10.394, "y": 0, "z": 0 }, @@ -1943,8 +1943,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -1969,7 +1969,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 15, + "width": 30.25, "height": 20 }, "_anchorPoint": { @@ -2000,25 +2000,25 @@ "_color": { "__type__": "cc.Color", "r": 255, - "g": 179, - "b": 82, + "g": 198, + "b": 17, "a": 255 }, "_string": "13", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 56, + "_fontSize": 56, "_fontFamily": "Arial", "_lineHeight": 20, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -2142,22 +2142,22 @@ "_active": true, "_components": [ { - "__id__": 212 + "__id__": 217 }, { - "__id__": 214 + "__id__": 219 }, { - "__id__": 216 + "__id__": 221 } ], "_prefab": { - "__id__": 218 + "__id__": 223 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -51, + "y": -51.861, "z": 0 }, "_lrot": { @@ -2570,34 +2570,34 @@ "__id__": 120 }, { - "__id__": 185 + "__id__": 190 } ], "_active": true, "_components": [ { - "__id__": 203 - }, - { - "__id__": 200 + "__id__": 208 }, { "__id__": 205 }, { - "__id__": 207 + "__id__": 210 }, { - "__id__": 209 + "__id__": 212 + }, + { + "__id__": 214 } ], "_prefab": { - "__id__": 211 + "__id__": 216 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 6.266999999999996, + "y": 0, "z": 0 }, "_lrot": { @@ -2637,31 +2637,31 @@ "__id__": 133 }, { - "__id__": 148 + "__id__": 145 }, { - "__id__": 163 + "__id__": 164 } ], "_active": true, "_components": [ { - "__id__": 178 + "__id__": 183 }, { - "__id__": 180 + "__id__": 185 }, { - "__id__": 182 + "__id__": 187 } ], "_prefab": { - "__id__": 184 + "__id__": 189 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 243.9, + "y": 258.9, "z": 0 }, "_lrot": { @@ -2765,7 +2765,7 @@ "value": { "__type__": "cc.Vec3", "x": -160, - "y": -120, + "y": -128, "z": 0 } }, @@ -2876,9 +2876,6 @@ }, { "__id__": 144 - }, - { - "__id__": 146 } ], "removedComponents": [] @@ -2909,8 +2906,8 @@ ], "value": { "__type__": "cc.Vec3", - "x": 0, - "y": -120, + "x": -160, + "y": -128, "z": 0 } }, @@ -2966,35 +2963,13 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 145 - }, - "propertyPath": [ - "_enabled" - ], - "value": false - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "3aMW06471HwpgHeF0r4+4M" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 147 + "__id__": 143 }, "propertyPath": [ "_active" ], "value": false }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "dchT3ooxlOOL9eH/XiAT2K" - ] - }, { "__type__": "cc.Node", "_objFlags": 0, @@ -3002,14 +2977,14 @@ "__id__": 120 }, "_prefab": { - "__id__": 149 + "__id__": 146 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 148 + "__id__": 145 }, "asset": { "__uuid__": "211839e3-132d-429d-9e68-a96fcdfb0ff7", @@ -3017,7 +2992,7 @@ }, "fileId": "dchT3ooxlOOL9eH/XiAT2K", "instance": { - "__id__": 150 + "__id__": 147 } }, { @@ -3030,22 +3005,28 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 151 + "__id__": 148 }, { - "__id__": 153 + "__id__": 150 }, { - "__id__": 155 + "__id__": 152 }, { - "__id__": 157 + "__id__": 154 }, { - "__id__": 159 + "__id__": 156 }, { - "__id__": 161 + "__id__": 158 + }, + { + "__id__": 160 + }, + { + "__id__": 162 } ], "removedComponents": [] @@ -3053,7 +3034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 152 + "__id__": 149 }, "propertyPath": [ "_name" @@ -3069,7 +3050,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 154 + "__id__": 151 }, "propertyPath": [ "_lpos" @@ -3077,7 +3058,7 @@ "value": { "__type__": "cc.Vec3", "x": -160, - "y": -120, + "y": -128, "z": 0 } }, @@ -3090,7 +3071,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 156 + "__id__": 153 }, "propertyPath": [ "_lrot" @@ -3112,7 +3093,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 158 + "__id__": 155 }, "propertyPath": [ "_euler" @@ -3133,7 +3114,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 160 + "__id__": 157 }, "propertyPath": [ "_enabled" @@ -3149,7 +3130,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 162 + "__id__": 159 }, "propertyPath": [ "_active" @@ -3162,6 +3143,46 @@ "dchT3ooxlOOL9eH/XiAT2K" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 161 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 71.81, + "height": 18 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "276iFXJJBND6xagl8JLo54" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 163 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 17.13, + "height": 18 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbXhjtUG9CVpcniyjLku3O" + ] + }, { "__type__": "cc.Node", "_objFlags": 0, @@ -3169,14 +3190,14 @@ "__id__": 120 }, "_prefab": { - "__id__": 164 + "__id__": 165 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 163 + "__id__": 164 }, "asset": { "__uuid__": "211839e3-132d-429d-9e68-a96fcdfb0ff7", @@ -3184,7 +3205,7 @@ }, "fileId": "dchT3ooxlOOL9eH/XiAT2K", "instance": { - "__id__": 165 + "__id__": 166 } }, { @@ -3197,22 +3218,28 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 166 + "__id__": 167 }, { - "__id__": 168 + "__id__": 169 }, { - "__id__": 170 + "__id__": 171 }, { - "__id__": 172 + "__id__": 173 }, { - "__id__": 174 + "__id__": 175 }, { - "__id__": 176 + "__id__": 177 + }, + { + "__id__": 179 + }, + { + "__id__": 181 } ], "removedComponents": [] @@ -3220,7 +3247,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 167 + "__id__": 168 }, "propertyPath": [ "_name" @@ -3236,15 +3263,15 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 169 + "__id__": 170 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": -160, - "y": -120, + "x": 0, + "y": -128, "z": 0 } }, @@ -3257,7 +3284,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 171 + "__id__": 172 }, "propertyPath": [ "_lrot" @@ -3279,7 +3306,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 173 + "__id__": 174 }, "propertyPath": [ "_euler" @@ -3300,7 +3327,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 175 + "__id__": 176 }, "propertyPath": [ "_enabled" @@ -3316,7 +3343,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 177 + "__id__": 178 }, "propertyPath": [ "_active" @@ -3329,6 +3356,46 @@ "dchT3ooxlOOL9eH/XiAT2K" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 180 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 71.81, + "height": 18 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "276iFXJJBND6xagl8JLo54" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 182 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 17.13, + "height": 18 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "fbXhjtUG9CVpcniyjLku3O" + ] + }, { "__type__": "cc.UITransform", "_name": "", @@ -3338,12 +3405,12 @@ }, "_enabled": false, "__prefab": { - "__id__": 179 + "__id__": 184 }, "_contentSize": { "__type__": "cc.Size", "width": 490, - "height": 2.0000000000000284 + "height": -2 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3365,7 +3432,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 181 + "__id__": 186 }, "_resizeMode": 1, "_layoutType": 3, @@ -3377,10 +3444,10 @@ "_startAxis": 0, "_paddingLeft": 10, "_paddingRight": 10, - "_paddingTop": 2, + "_paddingTop": -2, "_paddingBottom": 0, "_spacingX": 10, - "_spacingY": 14, + "_spacingY": 8, "_verticalDirection": 1, "_horizontalDirection": 0, "_constraint": 2, @@ -3402,14 +3469,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 188 }, "_alignFlags": 45, "_target": null, "_left": -10, "_right": -10, "_top": 6.099999999999994, - "_bottom": 491.9, + "_bottom": 525.9, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -3447,26 +3514,26 @@ }, "_children": [ { - "__id__": 186 + "__id__": 191 } ], "_active": false, "_components": [ { - "__id__": 192 + "__id__": 197 }, { - "__id__": 194 + "__id__": 199 }, { - "__id__": 196 + "__id__": 201 }, { - "__id__": 198 + "__id__": 203 } ], "_prefab": { - "__id__": 202 + "__id__": 207 }, "_lpos": { "__type__": "cc.Vec3", @@ -3501,20 +3568,20 @@ "_name": "bar", "_objFlags": 0, "_parent": { - "__id__": 185 + "__id__": 190 }, "_children": [], "_active": true, "_components": [ { - "__id__": 187 + "__id__": 192 }, { - "__id__": 189 + "__id__": 194 } ], "_prefab": { - "__id__": 191 + "__id__": 196 }, "_lpos": { "__type__": "cc.Vec3", @@ -3549,11 +3616,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 186 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 188 + "__id__": 193 }, "_contentSize": { "__type__": "cc.Size", @@ -3576,11 +3643,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 186 + "__id__": 191 }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 195 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3630,11 +3697,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 185 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 198 }, "_contentSize": { "__type__": "cc.Size", @@ -3657,11 +3724,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 185 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 200 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3701,11 +3768,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 185 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 202 }, "_alignFlags": 37, "_target": null, @@ -3736,17 +3803,17 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 185 + "__id__": 190 }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 204 }, "_scrollView": { - "__id__": 200 + "__id__": 205 }, "_handle": { - "__id__": 189 + "__id__": 194 }, "_direction": 1, "_enableAutoHide": false, @@ -3766,7 +3833,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 206 }, "bounceDuration": 1, "brake": 0.5, @@ -3781,7 +3848,7 @@ }, "_horizontalScrollBar": null, "_verticalScrollBar": { - "__id__": 198 + "__id__": 203 }, "_id": "" }, @@ -3808,12 +3875,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 209 }, "_contentSize": { "__type__": "cc.Size", "width": 470, - "height": 500 + "height": 530 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3835,7 +3902,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 211 }, "_type": 0, "_inverted": false, @@ -3856,7 +3923,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 213 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3901,14 +3968,14 @@ }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 215 }, "_alignFlags": 45, "_target": null, "_left": 5, "_right": 5, - "_top": -11.266999999999996, - "_bottom": 1.266999999999996, + "_top": -5, + "_bottom": -5, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -3946,12 +4013,12 @@ }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 218 }, "_contentSize": { "__type__": "cc.Size", "width": 480, - "height": 490 + "height": 520 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3973,7 +4040,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 215 + "__id__": 220 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4017,7 +4084,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 222 }, "_id": "" }, @@ -4044,7 +4111,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 225 }, "_contentSize": { "__type__": "cc.Size", @@ -4081,7 +4148,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 223 + "__id__": 228 }, "_contentSize": { "__type__": "cc.Size", @@ -4108,7 +4175,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 230 }, "playOnLoad": false, "_clips": [ @@ -4150,7 +4217,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 233 }, "_contentSize": { "__type__": "cc.Size", @@ -4178,7 +4245,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 235 }, "_alignFlags": 45, "_target": null, @@ -4213,10 +4280,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 237 }, "animation": { - "__id__": 224 + "__id__": 229 }, "closeButton": { "__id__": 31 @@ -4256,10 +4323,10 @@ "targetOverrides": [], "nestedPrefabInstanceRoots": [ { - "__id__": 163 + "__id__": 164 }, { - "__id__": 148 + "__id__": 145 }, { "__id__": 133 diff --git a/assets/Scenes/Game.scene b/assets/Scenes/Game.scene index fc60922..5d22e47 100644 --- a/assets/Scenes/Game.scene +++ b/assets/Scenes/Game.scene @@ -2430,16 +2430,16 @@ "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": 255, - "y": -72, + "x": -16.149, + "y": 266.236, "z": 1000 }, "_lrot": { "__type__": "cc.Quat", "x": 0, "y": 0, - "z": -0.0008726645152351496, - "w": 0.9999996192282494 + "z": 0, + "w": 1 }, "_lscale": { "__type__": "cc.Vec3", @@ -2452,7 +2452,7 @@ "__type__": "cc.Vec3", "x": 0, "y": 0, - "z": -0.1 + "z": 0 }, "_id": "c4XsoErxpCwoh0Ud7l6xNv" }, @@ -2467,7 +2467,7 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 55.36, + "width": 34.94, "height": 50 }, "_anchorPoint": { @@ -2499,18 +2499,18 @@ "_string": "30", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 50, - "_fontSize": 50, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 50, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -2903,7 +2903,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 1.218, "z": 0 }, "_lrot": { @@ -3047,7 +3047,7 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 16.07, + "width": 18.13, "height": 30 }, "_anchorPoint": { @@ -3072,25 +3072,25 @@ "_color": { "__type__": "cc.Color", "r": 255, - "g": 224, - "b": 0, + "g": 198, + "b": 17, "a": 255 }, "_string": "0", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 30, - "_fontSize": 30, + "_actualFontSize": 58, + "_fontSize": 58, "_fontFamily": "Arial", "_lineHeight": 30, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 0.5, "_isItalic": false, "_isBold": false, "_isUnderline": false, diff --git a/assets/Scenes/Menu.scene b/assets/Scenes/Menu.scene index 0e877fc..ee15331 100644 --- a/assets/Scenes/Menu.scene +++ b/assets/Scenes/Menu.scene @@ -206,7 +206,7 @@ "value": { "__type__": "cc.Vec3", "x": 254.99999999999997, - "y": 339.99999999999994, + "y": 340.00000000000006, "z": 0 } }, @@ -1561,7 +1561,7 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 150.43, + "width": 132.72, "height": 26 }, "_anchorPoint": { @@ -1593,18 +1593,18 @@ "_string": "Highscore: 0", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 26, - "_fontSize": 26, + "_actualFontSize": 38, + "_fontSize": 38, "_fontFamily": "Arial", "_lineHeight": 26, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 1, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -1704,8 +1704,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -1728,7 +1728,7 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 100, + "width": 227.5, "height": 40 }, "_anchorPoint": { @@ -1760,18 +1760,18 @@ "_string": "Play", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 56, + "_fontSize": 56, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 1, "_enableWrapText": false, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 1, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -2021,8 +2021,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -2045,7 +2045,7 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 100, + "width": 227.5, "height": 40 }, "_anchorPoint": { @@ -2077,18 +2077,18 @@ "_string": "Upgrade", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 56, + "_fontSize": 56, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 1, "_enableWrapText": false, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 1, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -2554,8 +2554,8 @@ "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": 9.926, - "y": 0, + "x": 9.003, + "y": -1.436, "z": 0 }, "_lrot": { @@ -2591,7 +2591,7 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 16.07, + "width": 17.5, "height": 30 }, "_anchorPoint": { @@ -2616,25 +2616,25 @@ "_color": { "__type__": "cc.Color", "r": 255, - "g": 224, - "b": 0, + "g": 198, + "b": 17, "a": 255 }, "_string": "0", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 30, - "_fontSize": 30, + "_actualFontSize": 56, + "_fontSize": 56, "_fontFamily": "Arial", "_lineHeight": 30, "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 1, "_isItalic": false, "_isBold": false, "_isUnderline": false, @@ -2755,8 +2755,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_layer": 33554432, @@ -2779,7 +2779,7 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 130, + "width": 218.1, "height": 40 }, "_anchorPoint": { @@ -2811,23 +2811,23 @@ "_string": "Audio Settings", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 12, - "_fontSize": 12, + "_actualFontSize": 38, + "_fontSize": 38, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 1, "_enableWrapText": false, "_font": { - "__uuid__": "c96b42a9-d20d-4c59-8e99-8ed749a715c8", + "__uuid__": "65390837-3108-471e-819a-b0be70a7692f", "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, - "_spacingX": 0, + "_spacingX": 1, "_isItalic": false, "_isBold": false, "_isUnderline": false, "_underlineHeight": 2, - "_cacheMode": 0, + "_cacheMode": 1, "_id": "0foNkZgxJJWKhv+kjV9A9W" }, {