diff --git a/assets/resources/game/skills/tooltip.prefab b/assets/resources/game/skills/tooltip.prefab index c03f5aaf..7f18b820 100644 --- a/assets/resources/game/skills/tooltip.prefab +++ b/assets/resources/game/skills/tooltip.prefab @@ -100,7 +100,7 @@ "__id__": 3 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 17 @@ -218,7 +218,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -28.4375, + "x": -26.2975, "y": 0, "z": 0 }, @@ -259,8 +259,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 16.5, - "height": 60.7 + "width": 11.67, + "height": 45 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -305,8 +305,8 @@ "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "4ef42957-24a0-499f-991e-0594cb4d7513", - "__expectedType__": "cc.TTFFont" + "__uuid__": "983a109b-a5e3-4ba7-84c5-1c53817ba177", + "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, "_spacingX": 0, @@ -358,7 +358,7 @@ }, "_alignFlags": 8, "_target": null, - "_left": -18.4375, + "_left": -16.0225, "_right": 0, "_top": 0, "_bottom": 0, @@ -407,8 +407,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 36.5, - "height": 60.7 + "width": 32.22, + "height": 45 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -453,8 +453,8 @@ "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "4ef42957-24a0-499f-991e-0594cb4d7513", - "__expectedType__": "cc.TTFFont" + "__uuid__": "983a109b-a5e3-4ba7-84c5-1c53817ba177", + "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, "_spacingX": 0, @@ -677,7 +677,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -38.275390625, + "x": -36.930390625, "y": 0, "z": 0 }, @@ -764,8 +764,8 @@ "_overflow": 2, "_enableWrapText": true, "_font": { - "__uuid__": "4ef42957-24a0-499f-991e-0594cb4d7513", - "__expectedType__": "cc.TTFFont" + "__uuid__": "983a109b-a5e3-4ba7-84c5-1c53817ba177", + "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, "_spacingX": 0, @@ -866,8 +866,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 52, - "height": 65 + "width": 49.31, + "height": 50 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -912,8 +912,8 @@ "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "4ef42957-24a0-499f-991e-0594cb4d7513", - "__expectedType__": "cc.TTFFont" + "__uuid__": "983a109b-a5e3-4ba7-84c5-1c53817ba177", + "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, "_spacingX": 0, @@ -960,6 +960,8 @@ "__id__": 0 }, "fileId": "7c8ppuBQBCkYNiKQCtR6EX", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -999,6 +1001,8 @@ "__id__": 0 }, "fileId": "c4DSWlfURHMZeE4c7Gph4P", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -1310,7 +1314,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -47.5, + "x": -45.085, "y": 0.9629999999999654, "z": 0 }, @@ -1351,8 +1355,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 22.75, - "height": 79.6 + "width": 17.5, + "height": 60 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1397,8 +1401,8 @@ "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "4ef42957-24a0-499f-991e-0594cb4d7513", - "__expectedType__": "cc.TTFFont" + "__uuid__": "983a109b-a5e3-4ba7-84c5-1c53817ba177", + "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, "_spacingX": 0, @@ -1450,7 +1454,7 @@ }, "_alignFlags": 8, "_target": null, - "_left": -26.875, + "_left": -24.25, "_right": 0, "_top": 0, "_bottom": 0, @@ -1499,8 +1503,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 64, - "height": 79.6 + "width": 59.17, + "height": 60 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1545,8 +1549,8 @@ "_overflow": 0, "_enableWrapText": true, "_font": { - "__uuid__": "4ef42957-24a0-499f-991e-0594cb4d7513", - "__expectedType__": "cc.TTFFont" + "__uuid__": "983a109b-a5e3-4ba7-84c5-1c53817ba177", + "__expectedType__": "cc.BitmapFont" }, "_isSystemFontUsed": false, "_spacingX": 0, diff --git a/assets/resources/language/TFat.fnt b/assets/resources/language/TFat.fnt new file mode 100644 index 00000000..ee6c73c4 --- /dev/null +++ b/assets/resources/language/TFat.fnt @@ -0,0 +1,17 @@ +info face="ThaleahFat" size=72 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=1,1,1,1 spacing=1,1 +common lineHeight=76 base=48 scaleW=137 scaleH=139 pages=1 packed=0 +page id=0 file="TFat.png" +chars count=13 +char id=32 x=0 y=0 width=0 height=0 xoffset=0 yoffset=0 xadvance=23 page=0 chnl=15 +char id=43 x=0 y=111 width=28 height=28 xoffset=-2 yoffset=19 xadvance=27 page=0 chnl=15 +char id=45 x=29 y=111 width=23 height=14 xoffset=-2 yoffset=28 xadvance=23 page=0 chnl=15 +char id=48 x=0 y=0 width=37 height=36 xoffset=-2 yoffset=15 xadvance=36 page=0 chnl=15 +char id=49 x=114 y=0 width=23 height=36 xoffset=-2 yoffset=15 xadvance=23 page=0 chnl=15 +char id=50 x=0 y=37 width=37 height=36 xoffset=-2 yoffset=15 xadvance=36 page=0 chnl=15 +char id=51 x=0 y=74 width=37 height=36 xoffset=-2 yoffset=15 xadvance=36 page=0 chnl=15 +char id=52 x=38 y=0 width=37 height=36 xoffset=-2 yoffset=15 xadvance=36 page=0 chnl=15 +char id=53 x=38 y=37 width=37 height=36 xoffset=-2 yoffset=15 xadvance=36 page=0 chnl=15 +char id=54 x=38 y=74 width=37 height=36 xoffset=-2 yoffset=15 xadvance=36 page=0 chnl=15 +char id=55 x=76 y=0 width=37 height=36 xoffset=-2 yoffset=15 xadvance=36 page=0 chnl=15 +char id=56 x=76 y=37 width=37 height=36 xoffset=-2 yoffset=15 xadvance=36 page=0 chnl=15 +char id=57 x=76 y=74 width=37 height=36 xoffset=-2 yoffset=15 xadvance=36 page=0 chnl=15 diff --git a/assets/resources/language/TFat.fnt.meta b/assets/resources/language/TFat.fnt.meta new file mode 100644 index 00000000..0367d713 --- /dev/null +++ b/assets/resources/language/TFat.fnt.meta @@ -0,0 +1,165 @@ +{ + "ver": "1.0.6", + "importer": "bitmap-font", + "imported": true, + "uuid": "983a109b-a5e3-4ba7-84c5-1c53817ba177", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "_fntConfig": { + "commonHeight": 76, + "fontSize": 72, + "atlasName": "TFat.png", + "fontDefDictionary": { + "32": { + "rect": { + "x": 0, + "y": 0, + "width": 0, + "height": 0 + }, + "xOffset": 0, + "yOffset": 0, + "xAdvance": 23 + }, + "43": { + "rect": { + "x": 0, + "y": 111, + "width": 28, + "height": 28 + }, + "xOffset": -2, + "yOffset": 19, + "xAdvance": 27 + }, + "45": { + "rect": { + "x": 29, + "y": 111, + "width": 23, + "height": 14 + }, + "xOffset": -2, + "yOffset": 28, + "xAdvance": 23 + }, + "48": { + "rect": { + "x": 0, + "y": 0, + "width": 37, + "height": 36 + }, + "xOffset": -2, + "yOffset": 15, + "xAdvance": 36 + }, + "49": { + "rect": { + "x": 114, + "y": 0, + "width": 23, + "height": 36 + }, + "xOffset": -2, + "yOffset": 15, + "xAdvance": 23 + }, + "50": { + "rect": { + "x": 0, + "y": 37, + "width": 37, + "height": 36 + }, + "xOffset": -2, + "yOffset": 15, + "xAdvance": 36 + }, + "51": { + "rect": { + "x": 0, + "y": 74, + "width": 37, + "height": 36 + }, + "xOffset": -2, + "yOffset": 15, + "xAdvance": 36 + }, + "52": { + "rect": { + "x": 38, + "y": 0, + "width": 37, + "height": 36 + }, + "xOffset": -2, + "yOffset": 15, + "xAdvance": 36 + }, + "53": { + "rect": { + "x": 38, + "y": 37, + "width": 37, + "height": 36 + }, + "xOffset": -2, + "yOffset": 15, + "xAdvance": 36 + }, + "54": { + "rect": { + "x": 38, + "y": 74, + "width": 37, + "height": 36 + }, + "xOffset": -2, + "yOffset": 15, + "xAdvance": 36 + }, + "55": { + "rect": { + "x": 76, + "y": 0, + "width": 37, + "height": 36 + }, + "xOffset": -2, + "yOffset": 15, + "xAdvance": 36 + }, + "56": { + "rect": { + "x": 76, + "y": 37, + "width": 37, + "height": 36 + }, + "xOffset": -2, + "yOffset": 15, + "xAdvance": 36 + }, + "57": { + "rect": { + "x": 76, + "y": 74, + "width": 37, + "height": 36 + }, + "xOffset": -2, + "yOffset": 15, + "xAdvance": 36 + } + }, + "kerningDict": {} + }, + "fontSize": 72, + "textureUuid": "4e4d1811-5bd5-4b5d-9535-a118dc3c970f" + } +} diff --git a/assets/resources/language/TFat.png b/assets/resources/language/TFat.png new file mode 100644 index 00000000..9b0365db Binary files /dev/null and b/assets/resources/language/TFat.png differ diff --git a/assets/resources/language/TFat.png.meta b/assets/resources/language/TFat.png.meta new file mode 100644 index 00000000..5c080d6b --- /dev/null +++ b/assets/resources/language/TFat.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "4e4d1811-5bd5-4b5d-9535-a118dc3c970f", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "4e4d1811-5bd5-4b5d-9535-a118dc3c970f@6c48a", + "displayName": "TFat", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "4e4d1811-5bd5-4b5d-9535-a118dc3c970f", + "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": "4e4d1811-5bd5-4b5d-9535-a118dc3c970f@f9941", + "displayName": "TFat", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 1, + "width": 135, + "height": 137, + "rawWidth": 137, + "rawHeight": 139, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -67.5, + -68.5, + 0, + 67.5, + -68.5, + 0, + -67.5, + 68.5, + 0, + 67.5, + 68.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 1, + 138, + 136, + 138, + 1, + 1, + 136, + 1 + ], + "nuv": [ + 0.0072992700729927005, + 0.007194244604316547, + 0.9927007299270073, + 0.007194244604316547, + 0.0072992700729927005, + 0.9928057553956835, + 0.9927007299270073, + 0.9928057553956835 + ], + "minPos": [ + -67.5, + -68.5, + 0 + ], + "maxPos": [ + 67.5, + 68.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "4e4d1811-5bd5-4b5d-9535-a118dc3c970f@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "4e4d1811-5bd5-4b5d-9535-a118dc3c970f@f9941" + } +} diff --git a/assets/resources/language/ThaleahFat_TTF.ttf b/assets/resources/language/ThaleahFat_TTF.ttf deleted file mode 100644 index 91fc7dc3..00000000 Binary files a/assets/resources/language/ThaleahFat_TTF.ttf and /dev/null differ diff --git a/assets/resources/language/ThaleahFat_TTF.ttf.meta b/assets/resources/language/ThaleahFat_TTF.ttf.meta deleted file mode 100644 index 2de30b49..00000000 --- a/assets/resources/language/ThaleahFat_TTF.ttf.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.1", - "importer": "ttf-font", - "imported": true, - "uuid": "4ef42957-24a0-499f-991e-0594cb4d7513", - "files": [ - ".json", - "ThaleahFat_TTF.ttf" - ], - "subMetas": {}, - "userData": {} -}