diff --git a/Assets/Resources/Fonts/WarioWare/WarioWareV2.ttf b/Assets/Resources/Fonts/WarioWare/WarioWareV2.ttf index 714531536..fc0babfb2 100644 Binary files a/Assets/Resources/Fonts/WarioWare/WarioWareV2.ttf and b/Assets/Resources/Fonts/WarioWare/WarioWareV2.ttf differ diff --git a/Assets/Resources/Fonts/WarioWare/WarioWareV2.ttf.meta b/Assets/Resources/Fonts/WarioWare/WarioWareV2.ttf.meta index a07201e89..08255b08b 100644 --- a/Assets/Resources/Fonts/WarioWare/WarioWareV2.ttf.meta +++ b/Assets/Resources/Fonts/WarioWare/WarioWareV2.ttf.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d41d6bb5b644c8f4fa4a1f4d263fda8a +guid: 91112f279fdc11140a3d938a72ba43d7 TrueTypeFontImporter: externalObjects: {} serializedVersion: 4 diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF 1.mat b/Assets/Resources/Fonts/WarioWareV2 SDF 1.mat index 681a7a670..159dc64ef 100644 --- a/Assets/Resources/Fonts/WarioWareV2 SDF 1.mat +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 1.mat @@ -9,10 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: WarioWareV2 SDF 1 m_Shader: {fileID: 4800000, guid: bc1ede39bf3643ee8e493720e4259791, type: 3} - m_ValidKeywords: - - OUTLINE_ON - m_InvalidKeywords: - - RATIOS_OFF + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -35,7 +33,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: -1146289709009396516, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_Texture: {fileID: -9207900762049679325, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskTex: @@ -76,20 +74,19 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.366 - - _Padding: 0 + - _OutlineWidth: 0.336 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 1 - - _ScaleRatioB: 1 - - _ScaleRatioC: 1 + - _ScaleRatioA: 0.9 + - _ScaleRatioB: 0.73125 + - _ScaleRatioC: 0.73125 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 - _Sharpness: 0 - _SpecularPower: 2 - _Stencil: 0 - - _StencilComp: 0 + - _StencilComp: 8 - _StencilOp: 0 - _StencilReadMask: 255 - _StencilWriteMask: 255 @@ -99,14 +96,12 @@ Material: - _UnderlayOffsetX: 0 - _UnderlayOffsetY: 0 - _UnderlaySoftness: 0 - - _UseUIAlphaClip: 0 - _VertexOffsetX: 0 - _VertexOffsetY: 0 - _WeightBold: 0.75 - _WeightNormal: 0 m_Colors: - - _ClipRect: {r: -10, g: -10, b: -7, a: 10} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - _FaceColor: {r: 1, g: 1, b: 1, a: 1} - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF 2.mat b/Assets/Resources/Fonts/WarioWareV2 SDF 2.mat index b9caac13b..82aac18ec 100644 --- a/Assets/Resources/Fonts/WarioWareV2 SDF 2.mat +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 2.mat @@ -9,10 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: WarioWareV2 SDF 2 m_Shader: {fileID: 4800000, guid: bc1ede39bf3643ee8e493720e4259791, type: 3} - m_ValidKeywords: - - OUTLINE_ON - m_InvalidKeywords: - - RATIOS_OFF + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -35,7 +33,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: -1146289709009396516, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_Texture: {fileID: -9207900762049679325, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskTex: @@ -76,20 +74,19 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.366 - - _Padding: 0 + - _OutlineWidth: 0.336 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 1 - - _ScaleRatioB: 1 - - _ScaleRatioC: 1 + - _ScaleRatioA: 0.9 + - _ScaleRatioB: 0.73125 + - _ScaleRatioC: 0.73125 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 - _Sharpness: 0 - _SpecularPower: 2 - _Stencil: 0 - - _StencilComp: 0 + - _StencilComp: 8 - _StencilOp: 0 - _StencilReadMask: 255 - _StencilWriteMask: 255 @@ -99,14 +96,12 @@ Material: - _UnderlayOffsetX: 0 - _UnderlayOffsetY: 0 - _UnderlaySoftness: 0 - - _UseUIAlphaClip: 0 - _VertexOffsetX: 0 - _VertexOffsetY: 0 - _WeightBold: 0.75 - _WeightNormal: 0 m_Colors: - - _ClipRect: {r: -10, g: -10, b: -7, a: 10} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - _FaceColor: {r: 1, g: 1, b: 1, a: 1} - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF 3.mat b/Assets/Resources/Fonts/WarioWareV2 SDF 3.mat index 0882a6b87..23177f759 100644 --- a/Assets/Resources/Fonts/WarioWareV2 SDF 3.mat +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 3.mat @@ -9,10 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: WarioWareV2 SDF 3 m_Shader: {fileID: 4800000, guid: bc1ede39bf3643ee8e493720e4259791, type: 3} - m_ValidKeywords: - - OUTLINE_ON - m_InvalidKeywords: - - RATIOS_OFF + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -22,10 +20,6 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _AlphaTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -39,7 +33,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: -1146289709009396516, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_Texture: {fileID: -9207900762049679325, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskTex: @@ -52,7 +46,6 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - PixelSnap: 0 - _Ambient: 0.5 - _Bevel: 0.5 - _BevelClamp: 0 @@ -63,9 +56,7 @@ Material: - _BumpOutline: 0 - _ColorMask: 15 - _CullMode: 0 - - _Cutoff: 0 - _Diffuse: 0.5 - - _EnableExternalAlpha: 0 - _FaceDilate: 0 - _FaceUVSpeedX: 0 - _FaceUVSpeedY: 0 @@ -83,20 +74,19 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.366 - - _Padding: 0 + - _OutlineWidth: 0.336 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 1 - - _ScaleRatioB: 1 - - _ScaleRatioC: 1 + - _ScaleRatioA: 0.9 + - _ScaleRatioB: 0.73125 + - _ScaleRatioC: 0.73125 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 - _Sharpness: 0 - _SpecularPower: 2 - _Stencil: 0 - - _StencilComp: 0 + - _StencilComp: 8 - _StencilOp: 0 - _StencilReadMask: 255 - _StencilWriteMask: 255 @@ -106,14 +96,12 @@ Material: - _UnderlayOffsetX: 0 - _UnderlayOffsetY: 0 - _UnderlaySoftness: 0 - - _UseUIAlphaClip: 0 - _VertexOffsetX: 0 - _VertexOffsetY: 0 - _WeightBold: 0.75 - _WeightNormal: 0 m_Colors: - - _ClipRect: {r: -10, g: -10, b: -7, a: 10} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - _FaceColor: {r: 1, g: 1, b: 1, a: 1} - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF 4.mat b/Assets/Resources/Fonts/WarioWareV2 SDF 4.mat index 33582b6d9..82ecd44b4 100644 --- a/Assets/Resources/Fonts/WarioWareV2 SDF 4.mat +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 4.mat @@ -9,10 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: WarioWareV2 SDF 4 m_Shader: {fileID: 4800000, guid: bc1ede39bf3643ee8e493720e4259791, type: 3} - m_ValidKeywords: - - OUTLINE_ON - m_InvalidKeywords: - - RATIOS_OFF + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -35,7 +33,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: -1146289709009396516, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_Texture: {fileID: -9207900762049679325, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskTex: @@ -76,20 +74,19 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.366 - - _Padding: 0 + - _OutlineWidth: 0.336 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 1 - - _ScaleRatioB: 1 - - _ScaleRatioC: 1 + - _ScaleRatioA: 0.9 + - _ScaleRatioB: 0.73125 + - _ScaleRatioC: 0.73125 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 - _Sharpness: 0 - _SpecularPower: 2 - _Stencil: 0 - - _StencilComp: 0 + - _StencilComp: 8 - _StencilOp: 0 - _StencilReadMask: 255 - _StencilWriteMask: 255 @@ -99,14 +96,12 @@ Material: - _UnderlayOffsetX: 0 - _UnderlayOffsetY: 0 - _UnderlaySoftness: 0 - - _UseUIAlphaClip: 0 - _VertexOffsetX: 0 - _VertexOffsetY: 0 - _WeightBold: 0.75 - _WeightNormal: 0 m_Colors: - - _ClipRect: {r: -10, g: -10, b: -8.370649, a: 10} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - _FaceColor: {r: 1, g: 1, b: 1, a: 1} - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF 5.mat b/Assets/Resources/Fonts/WarioWareV2 SDF 5.mat index 1ab63a7b8..f19b72891 100644 --- a/Assets/Resources/Fonts/WarioWareV2 SDF 5.mat +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 5.mat @@ -9,10 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: WarioWareV2 SDF 5 m_Shader: {fileID: 4800000, guid: bc1ede39bf3643ee8e493720e4259791, type: 3} - m_ValidKeywords: - - OUTLINE_ON - m_InvalidKeywords: - - RATIOS_OFF + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -35,7 +33,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: -1146289709009396516, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_Texture: {fileID: -9207900762049679325, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskTex: @@ -76,20 +74,19 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.366 - - _Padding: 0 + - _OutlineWidth: 0.336 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 1 - - _ScaleRatioB: 1 - - _ScaleRatioC: 1 + - _ScaleRatioA: 0.9 + - _ScaleRatioB: 0.73125 + - _ScaleRatioC: 0.73125 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 - _Sharpness: 0 - _SpecularPower: 2 - _Stencil: 0 - - _StencilComp: 0 + - _StencilComp: 8 - _StencilOp: 0 - _StencilReadMask: 255 - _StencilWriteMask: 255 @@ -99,14 +96,12 @@ Material: - _UnderlayOffsetX: 0 - _UnderlayOffsetY: 0 - _UnderlaySoftness: 0 - - _UseUIAlphaClip: 0 - _VertexOffsetX: 0 - _VertexOffsetY: 0 - _WeightBold: 0.75 - _WeightNormal: 0 m_Colors: - - _ClipRect: {r: -10, g: -10, b: -7.73, a: 10} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - _FaceColor: {r: 1, g: 1, b: 1, a: 1} - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF.asset b/Assets/Resources/Fonts/WarioWareV2 SDF.asset index ac6d307ef..5713f5ff3 100644 --- a/Assets/Resources/Fonts/WarioWareV2 SDF.asset +++ b/Assets/Resources/Fonts/WarioWareV2 SDF.asset @@ -1,115 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!21 &-5366929467905383303 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: WarioWareV2 Atlas Material - m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: - - RATIOS_OFF - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _Cube: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _FaceTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: -1146289709009396516} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OutlineTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Ambient: 0.5 - - _Bevel: 0.5 - - _BevelClamp: 0 - - _BevelOffset: 0 - - _BevelRoundness: 0 - - _BevelWidth: 0 - - _BumpFace: 0 - - _BumpOutline: 0 - - _ColorMask: 15 - - _CullMode: 0 - - _Diffuse: 0.5 - - _FaceDilate: -0.1 - - _FaceUVSpeedX: 0 - - _FaceUVSpeedY: 0 - - _GlowInner: 0.05 - - _GlowOffset: 0 - - _GlowOuter: 0.05 - - _GlowPower: 0.75 - - _GradientScale: 10 - - _LightAngle: 3.1416 - - _MaskSoftnessX: 0 - - _MaskSoftnessY: 0 - - _OutlineSoftness: 0 - - _OutlineUVSpeedX: 0 - - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.366 - - _Padding: 0 - - _PerspectiveFilter: 0.875 - - _Reflectivity: 10 - - _ScaleRatioA: 1 - - _ScaleRatioB: 1 - - _ScaleRatioC: 1 - - _ScaleX: 1 - - _ScaleY: 1 - - _ShaderFlags: 0 - - _Sharpness: 0 - - _SpecularPower: 2 - - _Stencil: 0 - - _StencilComp: 0 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _TextureHeight: 1024 - - _TextureWidth: 1024 - - _UnderlayDilate: 0 - - _UnderlayOffsetX: 0 - - _UnderlayOffsetY: 0 - - _UnderlaySoftness: 0 - - _UseUIAlphaClip: 0 - - _VertexOffsetX: 0 - - _VertexOffsetY: 0 - - _WeightBold: 0.75 - - _WeightNormal: 0 - m_Colors: - - _ClipRect: {r: -10, g: -10, b: -7.73, a: 10} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - - _FaceColor: {r: 1, g: 1, b: 1, a: 1} - - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} - - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} - - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} - - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} - - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} - m_BuildTextureStacks: [] ---- !u!28 &-1146289709009396516 +--- !u!28 &-9207900762049679325 Texture2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -150,7 +41,7 @@ Texture2D: m_ColorSpace: 0 m_PlatformBlob: image data: 1 - _typelessdata: 00 + _typelessdata: cd m_StreamData: serializedVersion: 2 offset: 0 @@ -176,26 +67,26 @@ MonoBehaviour: m_PointSize: 90 m_Scale: 1 m_UnitsPerEM: 1000 - m_LineHeight: 102.87 - m_AscentLine: 86.22 + m_LineHeight: 103.86 + m_AscentLine: 86.4 m_CapLine: 74 m_MeanLine: 46 m_Baseline: 0 - m_DescentLine: -8.55 - m_SuperscriptOffset: 86.22 + m_DescentLine: -17.460001 + m_SuperscriptOffset: 86.4 m_SuperscriptSize: 0.5 - m_SubscriptOffset: -8.55 + m_SubscriptOffset: -17.460001 m_SubscriptSize: 0.5 - m_UnderlineOffset: -13.500001 - m_UnderlineThickness: 4.5 + m_UnderlineOffset: -5.5800004 + m_UnderlineThickness: 2.25 m_StrikethroughOffset: 18.4 - m_StrikethroughThickness: 4.5 + m_StrikethroughThickness: 2.25 m_TabWidth: 27 - m_Material: {fileID: -5366929467905383303} - m_SourceFontFileGUID: d41d6bb5b644c8f4fa4a1f4d263fda8a + m_Material: {fileID: 4748197209458614759} + m_SourceFontFileGUID: 91112f279fdc11140a3d938a72ba43d7 m_CreationSettings: sourceFontFileName: - sourceFontFileGUID: d41d6bb5b644c8f4fa4a1f4d263fda8a + sourceFontFileGUID: 91112f279fdc11140a3d938a72ba43d7 faceIndex: 0 pointSizeSamplingMode: 0 pointSize: 90 @@ -212,14 +103,14 @@ MonoBehaviour: fontStyleModifier: 0 renderMode: 4165 includeFontFeatures: 0 - m_SourceFontFile: {fileID: 12800000, guid: d41d6bb5b644c8f4fa4a1f4d263fda8a, type: 3} + m_SourceFontFile: {fileID: 12800000, guid: 91112f279fdc11140a3d938a72ba43d7, type: 3} m_SourceFontFilePath: m_AtlasPopulationMode: 1 InternalDynamicOS: 0 m_GlyphTable: [] m_CharacterTable: [] m_AtlasTextures: - - {fileID: -1146289709009396516} + - {fileID: -9207900762049679325} m_AtlasTextureIndex: 0 m_IsMultiAtlasTexturesEnabled: 0 m_GetFontFeatures: 1 @@ -297,3 +188,108 @@ MonoBehaviour: kerningPairs: [] fallbackFontAssets: [] atlas: {fileID: 0} +--- !u!21 &4748197209458614759 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WarioWareV2 Atlas Material + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Cube: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: -9207900762049679325} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _BumpFace: 0 + - _BumpOutline: 0 + - _ColorMask: 15 + - _CullMode: 0 + - _Diffuse: 0.5 + - _FaceDilate: 0 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 0.05 + - _GlowPower: 0.75 + - _GradientScale: 10 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _OutlineSoftness: 0 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 0 + - _PerspectiveFilter: 0.875 + - _Reflectivity: 10 + - _ScaleRatioA: 1 + - _ScaleRatioB: 1 + - _ScaleRatioC: 1 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _SpecularPower: 2 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _TextureHeight: 1024 + - _TextureWidth: 1024 + - _UnderlayDilate: 0 + - _UnderlayOffsetX: 0 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 0.75 + - _WeightNormal: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} + - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF.asset.meta b/Assets/Resources/Fonts/WarioWareV2 SDF.asset.meta index e3cbc8112..c0cf3bdf6 100644 --- a/Assets/Resources/Fonts/WarioWareV2 SDF.asset.meta +++ b/Assets/Resources/Fonts/WarioWareV2 SDF.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b4806f15343a2e74597397032ccfc8f7 +guid: 7fb4e6758a49be74fbd1ed730f8a25e1 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Resources/Games/bonOdori.prefab b/Assets/Resources/Games/bonOdori.prefab index 3d0260cfc..a54273d26 100644 --- a/Assets/Resources/Games/bonOdori.prefab +++ b/Assets/Resources/Games/bonOdori.prefab @@ -400,7 +400,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + - {fileID: 4748197209458614759, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -444,8 +444,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} - m_sharedMaterial: {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} + m_sharedMaterial: {fileID: 4748197209458614759, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -658,7 +658,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + - {fileID: 4748197209458614759, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -702,8 +702,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} - m_sharedMaterial: {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} + m_sharedMaterial: {fileID: 4748197209458614759, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2527,7 +2527,7 @@ Transform: - {fileID: 8498522789000248656} - {fileID: 4149122258595339136} m_Father: {fileID: 8473313144218655437} - m_RootOrder: 10 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1488502930672050118 SpriteRenderer: @@ -2642,7 +2642,7 @@ Transform: - {fileID: 728648227757501950} - {fileID: 1010951526018178842} m_Father: {fileID: 8473313144218655437} - m_RootOrder: 9 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6358609534666224376 SpriteRenderer: @@ -3336,7 +3336,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8473313144218655437} - m_RootOrder: 11 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3407,7 +3407,7 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 42519c954cb2f3d4994c58eb3a10c89e, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -3711,7 +3711,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + - {fileID: 4748197209458614759, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3755,8 +3755,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} - m_sharedMaterial: {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} + m_sharedMaterial: {fileID: 4748197209458614759, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -4580,7 +4580,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + - {fileID: 4748197209458614759, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4624,8 +4624,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} - m_sharedMaterial: {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} + m_sharedMaterial: {fileID: 4748197209458614759, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5321,7 +5321,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8473313144218655437} - m_RootOrder: 14 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5392,7 +5392,7 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_sharedMaterial: {fileID: 2100000, guid: b1901940ca0e0a342bdd90b6b6cd2a64, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -5821,7 +5821,7 @@ Transform: - {fileID: 3684883812708883783} - {fileID: 1736186089157390354} m_Father: {fileID: 8473313144218655437} - m_RootOrder: 8 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3197049386973504900 SpriteRenderer: @@ -5927,7 +5927,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8473313144218655437} - m_RootOrder: 12 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5998,7 +5998,7 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 131dc823f1ff8e947985d9b9da4622df, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -6800,7 +6800,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + - {fileID: 4748197209458614759, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6844,8 +6844,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} - m_sharedMaterial: {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} + m_sharedMaterial: {fileID: 4748197209458614759, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -7036,15 +7036,15 @@ Transform: - {fileID: 4389590328865582082} - {fileID: 3859919625309255425} - {fileID: 7025149057808423635} + - {fileID: 3070629536816959270} + - {fileID: 8895179119127956590} + - {fileID: 6419318073471297395} + - {fileID: 392734652595288100} - {fileID: 8387568492357112863} - {fileID: 298275253940792191} - {fileID: 8867001238483373209} - {fileID: 2258391813358905482} - {fileID: 825448749115441003} - - {fileID: 3070629536816959270} - - {fileID: 8895179119127956590} - - {fileID: 6419318073471297395} - - {fileID: 392734652595288100} - {fileID: 7792706461787782859} - {fileID: 3749870086284794031} m_Father: {fileID: 0} @@ -7418,7 +7418,7 @@ Transform: - {fileID: 2213005750114308325} - {fileID: 1960765599488996696} m_Father: {fileID: 8473313144218655437} - m_RootOrder: 7 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3815436267245979119 SpriteRenderer: @@ -9187,7 +9187,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8473313144218655437} - m_RootOrder: 13 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9258,7 +9258,7 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 24d0a9ca5cfbd304ab20e5f8bad1e021, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -9464,7 +9464,7 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 7fb4e6758a49be74fbd1ed730f8a25e1, type: 2} m_sharedMaterial: {fileID: 2100000, guid: c4b8a644bebf7844ba934921adfad6a8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -9576,7 +9576,7 @@ Transform: - {fileID: 8850645232796680541} - {fileID: 668698683872560763} m_Father: {fileID: 8473313144218655437} - m_RootOrder: 6 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7826307452119399042 SpriteRenderer: diff --git a/Assets/Scripts/Games/BonOdori/BonOdori.cs b/Assets/Scripts/Games/BonOdori/BonOdori.cs index 842e08d73..03190e5d7 100644 --- a/Assets/Scripts/Games/BonOdori/BonOdori.cs +++ b/Assets/Scripts/Games/BonOdori/BonOdori.cs @@ -180,6 +180,11 @@ namespace HeavenStudio.Games string originalText3; string originalText4; string originalText5; + Coroutine Scroll1; + Coroutine Scroll2; + Coroutine Scroll3; + Coroutine Scroll4; + Coroutine Scroll5; TextMeshProUGUI Text1_GUI; TextMeshProUGUI Text2_GUI; TextMeshProUGUI Text3_GUI; @@ -440,17 +445,27 @@ namespace HeavenStudio.Games { if (text1 is not "" && text1 is not "Type r| for red text, g| for green text and y| for yellow text. These can be used multiple times in a single line."){ + if (Scroll1 is not null) + { + StopCoroutine(Scroll1); + Scroll1 = null; + } Text6.GetComponent().SetMask(0, new Vector4(-10f, -10f, -10f, 10)); originalText1 = text1; text1 = ChangeColor(text1, false); Text1.text = text1; - ; + Text6.text = ChangeColor(originalText1, true); } if (text2 is not ""){ + if (Scroll2 is not null) + { + StopCoroutine(Scroll2); + Scroll2 = null; + } Text7.GetComponent().SetMask(0, new Vector4(-10f, -10f, -10f, 10)); originalText2 = text2; text2 = ChangeColor(text2, false); @@ -459,6 +474,11 @@ namespace HeavenStudio.Games } if (text3 is not ""){ + if (Scroll3 is not null) + { + StopCoroutine(Scroll3); + Scroll3 = null; + } originalText3 = text3; Text8.GetComponent().SetMask(0, new Vector4(-10f, -10f, -10f, 10)); @@ -469,6 +489,11 @@ namespace HeavenStudio.Games } if (text4 is not ""){ + if (Scroll4 is not null) + { + StopCoroutine(Scroll4); + Scroll4 = null; + } Text9.GetComponent().SetMask(0, new Vector4(-10f, -10f, -10f, 10)); originalText4 = text4; text4 = ChangeColor(text4, false); @@ -479,6 +504,11 @@ namespace HeavenStudio.Games } if (text5 is not ""){ + if (Scroll5 is not null) + { + StopCoroutine(Scroll5); + Scroll5 = null; + } Text10.GetComponent().SetMask(0, new Vector4(-10f, -10f, -10f, 10)); originalText5 = text5; text5 = ChangeColor(text5, false); @@ -491,26 +521,51 @@ namespace HeavenStudio.Games } public void DeleteText(bool text1, bool text2, bool text3, bool text4, bool text5){ if (text1 == true){ + if (Scroll1 is not null) + { + StopCoroutine(Scroll1); + Scroll1 = null; + } Text6.GetComponent().SetMask(0, new Vector4(-10, -10, -10, 10)); Text1.text = ""; Text6.text = ""; } if (text2 == true){ + if (Scroll2 is not null) + { + StopCoroutine(Scroll2); + Scroll2 = null; + } Text7.GetComponent().SetMask(0, new Vector4(-10, -10, -10, 10)); Text2.text = ""; Text7.text = ""; } if (text3 == true){ + if (Scroll3 is not null) + { + StopCoroutine(Scroll3); + Scroll3 = null; + } Text8.GetComponent().SetMask(0, new Vector4(-10, -10, -10, 10)); Text3.text = ""; Text8.text = ""; } if (text4 == true){ + if (Scroll4 is not null) + { + StopCoroutine(Scroll4); + Scroll4 = null; + } Text9.GetComponent().SetMask(0, new Vector4(-10, -10, -10, 10)); Text4.text = ""; Text9.text = ""; } if (text5 == true){ + if (Scroll5 is not null) + { + StopCoroutine(Scroll5); + Scroll5 = null; + } Text10.GetComponent().SetMask(0, new Vector4(-10, -10, -10, 10)); Text5.text = ""; Text10.text = ""; @@ -534,6 +589,7 @@ namespace HeavenStudio.Games text.GetComponent().SetMask(0, new Vector4(-10, -10, maskValue, 10)); yield return null; + } @@ -542,15 +598,15 @@ namespace HeavenStudio.Games public void ScrollText(bool text1, bool text2, bool text3, bool text4, bool text5, float length, double beat) { if (text1){ - StartCoroutine(SmoothText(Text6, length, beat));} + Scroll1 = StartCoroutine(SmoothText(Text6, length, beat));} if (text2){ - StartCoroutine(SmoothText(Text7, length, beat));} + Scroll2 = StartCoroutine(SmoothText(Text7, length, beat));} if (text3){ - StartCoroutine(SmoothText(Text8, length, beat));} + Scroll3 = StartCoroutine(SmoothText(Text8, length, beat));} if (text4){ - StartCoroutine(SmoothText(Text9, length, beat));} + Scroll4 = StartCoroutine(SmoothText(Text9, length, beat));} if (text5){ - StartCoroutine(SmoothText(Text10, length, beat));} + Scroll5 = StartCoroutine(SmoothText(Text10, length, beat));} }