diff --git a/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/ButtonSDFMaterial.mat b/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/ButtonSDFMaterial.mat index 69404735..14c88eb2 100644 --- a/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/ButtonSDFMaterial.mat +++ b/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/ButtonSDFMaterial.mat @@ -101,7 +101,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _OffBright: 0.5 - - _OutSmoothness: 0.001 + - _OutSmoothness: 0.075 - _OutThickness: 0.6 - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 @@ -118,7 +118,7 @@ Material: - _ScaleY: 1 - _ShaderFlags: 0 - _Sharpness: 0 - - _Smoothness: 0.001 + - _Smoothness: 0.075 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 @@ -130,7 +130,7 @@ Material: - _StencilWriteMask: 255 - _TextureHeight: 512 - _TextureWidth: 512 - - _Thickness: 0.9 + - _Thickness: 0.85 - _UVSec: 0 - _UnderlayDilate: 0 - _UnderlayOffsetX: 0 diff --git a/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/buttonIcons.png b/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/buttonIcons.png index e40f1adc..fcc9a3c9 100644 Binary files a/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/buttonIcons.png and b/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/buttonIcons.png differ diff --git a/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/buttonIcons.png.meta b/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/buttonIcons.png.meta index 85e718d1..675eee8a 100644 --- a/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/buttonIcons.png.meta +++ b/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/buttonIcons.png.meta @@ -22,7 +22,7 @@ TextureImporter: second: NorthOn - first: 213: -8244262083605341031 - second: EastOn + second: WestOn - first: 213: -4789233240444048905 second: RightOn @@ -38,6 +38,30 @@ TextureImporter: - first: 213: -5863448563183388835 second: UpOn + - first: + 213: -598839719690993186 + second: ShoulderLeftOn + - first: + 213: 7882489078324362733 + second: ShoulderRightOn + - first: + 213: -1348493139139215224 + second: ShoulderLeftOff + - first: + 213: 6499095914430324874 + second: ShoulderRightOff + - first: + 213: -7444272823696498285 + second: ShouldersOn + - first: + 213: -5368843543446870761 + second: ShouldersOff + - first: + 213: 5518843884416884346 + second: ShouldersRightOn + - first: + 213: 3724681018647327355 + second: ShouldersLeftOn externalObjects: {} serializedVersion: 11 mipmaps: @@ -68,7 +92,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 1 mipBias: 0 wrapU: 1 @@ -190,7 +214,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: WestOn + name: EastOn rect: serializedVersion: 2 x: 191 @@ -253,7 +277,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: EastOn + name: WestOn rect: serializedVersion: 2 x: 431 @@ -378,6 +402,174 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: ShoulderLeftOn + rect: + serializedVersion: 2 + x: 511 + y: 984 + width: 38 + height: 38 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ed18c6e927e70b7f0800000000000000 + internalID: -598839719690993186 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ShoulderRightOn + rect: + serializedVersion: 2 + x: 551 + y: 984 + width: 38 + height: 38 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ded7b63bd0a346d60800000000000000 + internalID: 7882489078324362733 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ShoulderLeftOff + rect: + serializedVersion: 2 + x: 511 + y: 944 + width: 38 + height: 38 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8804e8372a0394de0800000000000000 + internalID: -1348493139139215224 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ShoulderRightOff + rect: + serializedVersion: 2 + x: 551 + y: 944 + width: 38 + height: 38 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a80efccec4d613a50800000000000000 + internalID: 6499095914430324874 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ShouldersOn + rect: + serializedVersion: 2 + x: 591 + y: 984 + width: 78 + height: 38 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 391e97cee41a0b890800000000000000 + internalID: -7444272823696498285 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ShouldersOff + rect: + serializedVersion: 2 + x: 591 + y: 944 + width: 78 + height: 38 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 715233a1e390e75b0800000000000000 + internalID: -5368843543446870761 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ShouldersRightOn + rect: + serializedVersion: 2 + x: 671 + y: 984 + width: 78 + height: 38 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a7e5185d54fd69c40800000000000000 + internalID: 5518843884416884346 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ShouldersLeftOn + rect: + serializedVersion: 2 + x: 671 + y: 944 + width: 78 + height: 38 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b723d1af6a9b0b330800000000000000 + internalID: 3724681018647327355 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras.meta b/Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras.meta new file mode 100644 index 00000000..f39bad6b --- /dev/null +++ b/Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 379003d7d54b9bc4dae1d94aeb39109b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/hsEmoji.png b/Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/hsEmoji.png new file mode 100644 index 00000000..bc2b2d20 Binary files /dev/null and b/Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/hsEmoji.png differ diff --git a/Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/hsEmoji.png.meta b/Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/hsEmoji.png.meta new file mode 100644 index 00000000..1a7b3f76 --- /dev/null +++ b/Assets/Resources/Sprites/UI/Common/Textbox/TextboxExtras/hsEmoji.png.meta @@ -0,0 +1,288 @@ +fileFormatVersion: 2 +guid: fb23f410a80c2f0439d7148fc9fe6932 +TextureImporter: + internalIDToNameTable: + - first: + 213: 696307254153927553 + second: SpacemanPensive + - first: + 213: 825579231639803812 + second: MoaiCool + - first: + 213: 5944629093363706705 + second: MonkeySad + - first: + 213: -2528918449702486434 + second: DjThumbsUp + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: CosmicDisgust + rect: + serializedVersion: 2 + x: 1 + y: 767 + width: 256 + height: 256 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 763dae69b74d0fc40800000000000000 + internalID: 5544164768571118439 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: TrollAlien + rect: + serializedVersion: 2 + x: 259 + y: 895 + width: 123 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5b4a69592141681a0800000000000000 + internalID: -6807731716672281419 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: MakoSurprise + rect: + serializedVersion: 2 + x: 517 + y: 767 + width: 236 + height: 256 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5e38ff1b6378bc310800000000000000 + internalID: 1426382375977190373 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: LockstepNerd + rect: + serializedVersion: 2 + x: 259 + y: 670 + width: 256 + height: 222 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: db81b9f9d3564f410800000000000000 + internalID: 1509943090421110973 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: SpacemanPensive + rect: + serializedVersion: 2 + x: 389 + y: 905 + width: 128 + height: 111 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 18b5f5a22c7c9a900800000000000000 + internalID: 696307254153927553 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: MoaiCool + rect: + serializedVersion: 2 + x: 754 + y: 767 + width: 186 + height: 256 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4a794d3efeb057b00800000000000000 + internalID: 825579231639803812 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: MonkeySad + rect: + serializedVersion: 2 + x: 516 + y: 638 + width: 195 + height: 128 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 15b65671aa09f7250800000000000000 + internalID: 5944629093363706705 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: DjThumbsUp + rect: + serializedVersion: 2 + x: 713 + y: 672 + width: 128 + height: 93 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e5e3d8b911a77ecd0800000000000000 + internalID: -2528918449702486434 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Resources/Sprite Assets/Buttons.asset b/Assets/TextMesh Pro/Resources/Sprite Assets/Buttons.asset index 3bf61305..f8658f9a 100644 --- a/Assets/TextMesh Pro/Resources/Sprite Assets/Buttons.asset +++ b/Assets/TextMesh Pro/Resources/Sprite Assets/Buttons.asset @@ -67,8 +67,8 @@ MonoBehaviour: m_Unicode: 65534 m_GlyphIndex: 4 m_Scale: 1.5 - m_Name: WestOn - m_HashCode: -855200524 + m_Name: EastOn + m_HashCode: -1705581022 - m_ElementType: 2 m_Unicode: 65534 m_GlyphIndex: 5 @@ -85,8 +85,8 @@ MonoBehaviour: m_Unicode: 65534 m_GlyphIndex: 7 m_Scale: 1.5 - m_Name: EastOn - m_HashCode: -1705581022 + m_Name: WestOn + m_HashCode: -855200524 - m_ElementType: 2 m_Unicode: 65534 m_GlyphIndex: 8 @@ -111,6 +111,54 @@ MonoBehaviour: m_Scale: 1.5 m_Name: UpOn m_HashCode: 2934980 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 13 + m_Scale: 1.5 + m_Name: ShoulderLeftOff + m_HashCode: -1280656566 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 14 + m_Scale: 1.5 + m_Name: ShoulderLeftOn + m_HashCode: -429259356 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 15 + m_Scale: 1.5 + m_Name: ShoulderRightOff + m_HashCode: -1969608591 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 16 + m_Scale: 1.5 + m_Name: ShoulderRightOn + m_HashCode: -1621491393 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 17 + m_Scale: 1.5 + m_Name: ShouldersRightOn + m_HashCode: -174982548 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 18 + m_Scale: 1.5 + m_Name: ShouldersOff + m_HashCode: 1566278530 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 19 + m_Scale: 1.5 + m_Name: ShouldersOn + m_HashCode: -733440148 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 20 + m_Scale: 1.5 + m_Name: ShouldersLeftOn + m_HashCode: 1546430871 m_SpriteGlyphTable: - m_Index: 0 m_Metrics: @@ -186,7 +234,7 @@ MonoBehaviour: m_Height: 78 m_Scale: 1 m_AtlasIndex: 0 - sprite: {fileID: -8397132687541991269, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3} + sprite: {fileID: 8406874011085310447, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3} - m_Index: 5 m_Metrics: m_Width: 78 @@ -231,7 +279,7 @@ MonoBehaviour: m_Height: 78 m_Scale: 1 m_AtlasIndex: 0 - sprite: {fileID: -8244262083605341031, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3} + sprite: {fileID: -8397132687541991269, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3} - m_Index: 8 m_Metrics: m_Width: 67 @@ -292,6 +340,126 @@ MonoBehaviour: m_Scale: 1 m_AtlasIndex: 0 sprite: {fileID: -5863448563183388835, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3} + - m_Index: 13 + m_Metrics: + m_Width: 38 + m_Height: 38 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 32 + m_HorizontalAdvance: 38 + m_GlyphRect: + m_X: 511 + m_Y: 944 + m_Width: 38 + m_Height: 38 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: -1348493139139215224, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3} + - m_Index: 14 + m_Metrics: + m_Width: 38 + m_Height: 38 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 32 + m_HorizontalAdvance: 38 + m_GlyphRect: + m_X: 511 + m_Y: 984 + m_Width: 38 + m_Height: 38 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: -598839719690993186, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3} + - m_Index: 15 + m_Metrics: + m_Width: 38 + m_Height: 38 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 32 + m_HorizontalAdvance: 38 + m_GlyphRect: + m_X: 551 + m_Y: 944 + m_Width: 38 + m_Height: 38 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: 6499095914430324874, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3} + - m_Index: 16 + m_Metrics: + m_Width: 38 + m_Height: 38 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 32 + m_HorizontalAdvance: 38 + m_GlyphRect: + m_X: 551 + m_Y: 984 + m_Width: 38 + m_Height: 38 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: 7882489078324362733, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3} + - m_Index: 17 + m_Metrics: + m_Width: 78 + m_Height: 38 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 32 + m_HorizontalAdvance: 78 + m_GlyphRect: + m_X: 671 + m_Y: 944 + m_Width: 78 + m_Height: 38 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: 3724681018647327355, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3} + - m_Index: 18 + m_Metrics: + m_Width: 78 + m_Height: 38 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 32 + m_HorizontalAdvance: 78 + m_GlyphRect: + m_X: 591 + m_Y: 944 + m_Width: 78 + m_Height: 38 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: -5368843543446870761, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3} + - m_Index: 19 + m_Metrics: + m_Width: 78 + m_Height: 38 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 32 + m_HorizontalAdvance: 78 + m_GlyphRect: + m_X: 591 + m_Y: 984 + m_Width: 78 + m_Height: 38 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: -7444272823696498285, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3} + - m_Index: 20 + m_Metrics: + m_Width: 78 + m_Height: 38 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 19 + m_HorizontalAdvance: 78 + m_GlyphRect: + m_X: 671 + m_Y: 984 + m_Width: 78 + m_Height: 38 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: 5518843884416884346, guid: 149c162f840b9e9428b96653dd8e40ba, type: 3} spriteInfoList: [] fallbackSpriteAssets: [] --- !u!21 &7258175733076811168 diff --git a/Assets/TextMesh Pro/Resources/Sprite Assets/HeavenEmoji.asset b/Assets/TextMesh Pro/Resources/Sprite Assets/HeavenEmoji.asset new file mode 100644 index 00000000..a0b556a3 --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Sprite Assets/HeavenEmoji.asset @@ -0,0 +1,248 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84a92b25f83d49b9bc132d206b370281, type: 3} + m_Name: HeavenEmoji + m_EditorClassIdentifier: + hashCode: -1921020833 + material: {fileID: 1810431749039276685} + materialHashCode: 0 + m_Version: 1.1.0 + m_FaceInfo: + m_FaceIndex: 0 + m_FamilyName: + m_StyleName: + m_PointSize: 0 + m_Scale: 0 + m_LineHeight: 0 + m_AscentLine: 0 + m_CapLine: 0 + m_MeanLine: 0 + m_Baseline: 0 + m_DescentLine: 0 + m_SuperscriptOffset: 0 + m_SuperscriptSize: 0 + m_SubscriptOffset: 0 + m_SubscriptSize: 0 + m_UnderlineOffset: 0 + m_UnderlineThickness: 0 + m_StrikethroughOffset: 0 + m_StrikethroughThickness: 0 + m_TabWidth: 0 + spriteSheet: {fileID: 2800000, guid: fb23f410a80c2f0439d7148fc9fe6932, type: 3} + m_SpriteCharacterTable: + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 0 + m_Scale: 1.5 + m_Name: DonkTroll + m_HashCode: -387075033 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 1 + m_Scale: 1.75 + m_Name: CosmicDisgust + m_HashCode: 1555084851 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 2 + m_Scale: 1.75 + m_Name: MakoSurprise + m_HashCode: -581768703 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 3 + m_Scale: 1.8 + m_Name: LockstepNerd + m_HashCode: -1140652764 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 4 + m_Scale: 1.5 + m_Name: DjThumbsUp + m_HashCode: 1876350078 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 5 + m_Scale: 1.75 + m_Name: MoaiCool + m_HashCode: -1571705083 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 6 + m_Scale: 1.45 + m_Name: MonkeySad + m_HashCode: -309481747 + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 7 + m_Scale: 1.75 + m_Name: SpacemanPensive + m_HashCode: -326738892 + m_SpriteGlyphTable: + - m_Index: 0 + m_Metrics: + m_Width: 123 + m_Height: 128 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 100 + m_HorizontalAdvance: 123 + m_GlyphRect: + m_X: 259 + m_Y: 895 + m_Width: 123 + m_Height: 128 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: 8520508767416187551, guid: fb23f410a80c2f0439d7148fc9fe6932, type: 3} + - m_Index: 1 + m_Metrics: + m_Width: 256 + m_Height: 256 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 200 + m_HorizontalAdvance: 256 + m_GlyphRect: + m_X: 1 + m_Y: 767 + m_Width: 256 + m_Height: 256 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: -8499381173796814039, guid: fb23f410a80c2f0439d7148fc9fe6932, type: 3} + - m_Index: 2 + m_Metrics: + m_Width: 236 + m_Height: 256 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 200 + m_HorizontalAdvance: 236 + m_GlyphRect: + m_X: 517 + m_Y: 767 + m_Width: 236 + m_Height: 256 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: -4264556394388760843, guid: fb23f410a80c2f0439d7148fc9fe6932, type: 3} + - m_Index: 3 + m_Metrics: + m_Width: 256 + m_Height: 222 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 175 + m_HorizontalAdvance: 256 + m_GlyphRect: + m_X: 259 + m_Y: 670 + m_Width: 256 + m_Height: 222 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: -8666286934846544496, guid: fb23f410a80c2f0439d7148fc9fe6932, type: 3} + - m_Index: 4 + m_Metrics: + m_Width: 128 + m_Height: 93 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 82 + m_HorizontalAdvance: 128 + m_GlyphRect: + m_X: 713 + m_Y: 672 + m_Width: 128 + m_Height: 93 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: -2528918449702486434, guid: fb23f410a80c2f0439d7148fc9fe6932, type: 3} + - m_Index: 5 + m_Metrics: + m_Width: 186 + m_Height: 256 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 200 + m_HorizontalAdvance: 186 + m_GlyphRect: + m_X: 754 + m_Y: 767 + m_Width: 186 + m_Height: 256 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: 825579231639803812, guid: fb23f410a80c2f0439d7148fc9fe6932, type: 3} + - m_Index: 6 + m_Metrics: + m_Width: 195 + m_Height: 128 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 108 + m_HorizontalAdvance: 195 + m_GlyphRect: + m_X: 516 + m_Y: 638 + m_Width: 195 + m_Height: 128 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: 5944629093363706705, guid: fb23f410a80c2f0439d7148fc9fe6932, type: 3} + - m_Index: 7 + m_Metrics: + m_Width: 128 + m_Height: 111 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 90 + m_HorizontalAdvance: 128 + m_GlyphRect: + m_X: 389 + m_Y: 905 + m_Width: 128 + m_Height: 111 + m_Scale: 1 + m_AtlasIndex: 0 + sprite: {fileID: 696307254153927553, guid: fb23f410a80c2f0439d7148fc9fe6932, type: 3} + spriteInfoList: [] + fallbackSpriteAssets: [] +--- !u!21 &1810431749039276685 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TextMeshPro/Sprite + m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: fb23f410a80c2f0439d7148fc9fe6932, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _ColorMask: 15 + - _CullMode: 0 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/TextMesh Pro/Resources/Sprite Assets/HeavenEmoji.asset.meta b/Assets/TextMesh Pro/Resources/Sprite Assets/HeavenEmoji.asset.meta new file mode 100644 index 00000000..0d605726 --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Sprite Assets/HeavenEmoji.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 68c22dc494e75af43ac0c8797f696a96 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Resources/TMP Settings.asset b/Assets/TextMesh Pro/Resources/TMP Settings.asset index c09a92f1..70da65dc 100644 --- a/Assets/TextMesh Pro/Resources/TMP Settings.asset +++ b/Assets/TextMesh Pro/Resources/TMP Settings.asset @@ -29,18 +29,16 @@ MonoBehaviour: m_defaultTextMeshProTextContainerSize: {x: 20, y: 5} m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50} m_autoSizeTextContainer: 0 + m_IsTextObjectScaleStatic: 0 m_fallbackFontAssets: [] m_matchMaterialPreset: 1 - m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45, - type: 2} + m_defaultSpriteAsset: {fileID: 11400000, guid: 68c22dc494e75af43ac0c8797f696a96, type: 2} m_defaultSpriteAssetPath: Sprite Assets/ m_enableEmojiSupport: 1 m_MissingCharacterSpriteUnicode: 0 m_defaultColorGradientPresetsPath: Color Gradient Presets/ - m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, - type: 2} + m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, type: 2} m_StyleSheetsResourcePath: m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3} - m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, - type: 3} + m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, type: 3} m_UseModernHangulLineBreakingRules: 0