diff --git a/Assets/Resources/Fonts/Rodin DB.asset b/Assets/Resources/Fonts/Rodin DB.asset index 41fbaef2f..64ad785be 100644 --- a/Assets/Resources/Fonts/Rodin DB.asset +++ b/Assets/Resources/Fonts/Rodin DB.asset @@ -1611,21 +1611,6 @@ MonoBehaviour: m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 - - m_Index: 728 - m_Metrics: - m_Width: 117.859375 - m_Height: 117.859375 - m_HorizontalBearingX: 8.640625 - m_HorizontalBearingY: 109.625 - m_HorizontalAdvance: 135 - m_GlyphRect: - m_X: 67 - m_Y: 464 - m_Width: 119 - m_Height: 119 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - m_Index: 721 m_Metrics: m_Width: 133.90625 @@ -1641,6 +1626,21 @@ MonoBehaviour: m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 + - m_Index: 728 + m_Metrics: + m_Width: 117.859375 + m_Height: 117.859375 + m_HorizontalBearingX: 8.640625 + m_HorizontalBearingY: 109.625 + m_HorizontalAdvance: 135 + m_GlyphRect: + m_X: 67 + m_Y: 464 + m_Width: 119 + m_Height: 119 + m_Scale: 1 + m_AtlasIndex: 0 + m_ClassDefinitionType: 0 m_CharacterTable: - m_ElementType: 1 m_Unicode: 32 diff --git a/Assets/Resources/Fonts/Rodin DB.mat b/Assets/Resources/Fonts/Rodin DB.mat index b1a43165f..a53319ef0 100644 --- a/Assets/Resources/Fonts/Rodin DB.mat +++ b/Assets/Resources/Fonts/Rodin DB.mat @@ -106,7 +106,7 @@ Material: - _WeightBold: 0.75 - _WeightNormal: 0 m_Colors: - - _ClipRect: {r: -10, g: -10, b: -10, a: 10} + - _ClipRect: {r: -10, g: -10, b: -9.392164, a: 10} - _Color: {r: 0.6959069, g: 1, b: 0, a: 1} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - _FaceColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Resources/Fonts/Rodin DB 1.mat b/Assets/Resources/Fonts/WarioWareV2 SDF 1.mat similarity index 75% rename from Assets/Resources/Fonts/Rodin DB 1.mat rename to Assets/Resources/Fonts/WarioWareV2 SDF 1.mat index 0825f6f11..2fc69fbee 100644 --- a/Assets/Resources/Fonts/Rodin DB 1.mat +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 1.mat @@ -7,10 +7,12 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Rodin DB 1 - m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] + m_Name: WarioWareV2 SDF 1 + m_Shader: {fileID: 4800000, guid: bc1ede39bf3643ee8e493720e4259791, type: 3} + m_ValidKeywords: + - OUTLINE_ON + m_InvalidKeywords: + - RATIOS_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -33,7 +35,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 3307759631967023827, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_Texture: {fileID: -1146289709009396516, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OutlineTex: @@ -54,7 +60,6 @@ Material: - _CullMode: 0 - _Diffuse: 0.5 - _FaceDilate: 0 - - _FaceShininess: 0 - _FaceUVSpeedX: 0 - _FaceUVSpeedY: 0 - _GlowInner: 0.05 @@ -63,18 +68,21 @@ Material: - _GlowPower: 0.75 - _GradientScale: 10 - _LightAngle: 3.1416 + - _MaskEdgeSoftness: 0.01 + - _MaskInverse: 0 - _MaskSoftnessX: 0 - _MaskSoftnessY: 0 - - _OutlineShininess: 0 + - _MaskWipeControl: 0.5 - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.4 + - _OutlineWidth: 0.366 + - _Padding: 0 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 0.9 - - _ScaleRatioB: 0.73125 - - _ScaleRatioC: 0.73125 + - _ScaleRatioA: 1 + - _ScaleRatioB: 1 + - _ScaleRatioC: 1 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 @@ -97,16 +105,16 @@ Material: - _WeightBold: 0.75 - _WeightNormal: 0 m_Colors: - - _ClipRect: {r: -10, g: -10, b: 10, a: 10} - - _Color: {r: 0.6959069, g: 1, b: 0, a: 1} + - _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} + - _MaskEdgeColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0.105882354, b: 1, a: 1} - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0, g: 0, b: 0, a: 1} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - - _UnderlayColor: {r: 0, g: 1, b: 0.4488604, a: 0.5} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Fonts/Rodin DB 1.mat.meta b/Assets/Resources/Fonts/WarioWareV2 SDF 1.mat.meta similarity index 79% rename from Assets/Resources/Fonts/Rodin DB 1.mat.meta rename to Assets/Resources/Fonts/WarioWareV2 SDF 1.mat.meta index 71293c601..86ceb308c 100644 --- a/Assets/Resources/Fonts/Rodin DB 1.mat.meta +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 1.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7f924b6d4b4e7ca48b2e81603e0a82a1 +guid: c4b8a644bebf7844ba934921adfad6a8 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF 2.mat b/Assets/Resources/Fonts/WarioWareV2 SDF 2.mat new file mode 100644 index 000000000..faef8a3e3 --- /dev/null +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 2.mat @@ -0,0 +1,120 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_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, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 0} + 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 + - _MaskEdgeSoftness: 0.01 + - _MaskInverse: 0 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _MaskWipeControl: 0.5 + - _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} + - _MaskEdgeColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0.105882354, b: 1, 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 2.mat.meta b/Assets/Resources/Fonts/WarioWareV2 SDF 2.mat.meta new file mode 100644 index 000000000..393309152 --- /dev/null +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 42519c954cb2f3d4994c58eb3a10c89e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF 3.mat b/Assets/Resources/Fonts/WarioWareV2 SDF 3.mat new file mode 100644 index 000000000..6bd8635ae --- /dev/null +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 3.mat @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + 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} + 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, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 0} + 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: + - PixelSnap: 0 + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _BumpFace: 0 + - _BumpOutline: 0 + - _ColorMask: 15 + - _CullMode: 0 + - _Cutoff: 0 + - _Diffuse: 0.5 + - _EnableExternalAlpha: 0 + - _FaceDilate: 0 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 0.05 + - _GlowPower: 0.75 + - _GradientScale: 10 + - _LightAngle: 3.1416 + - _MaskEdgeSoftness: 0.01 + - _MaskInverse: 0 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _MaskWipeControl: 0.5 + - _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} + - _MaskEdgeColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0.105882354, b: 1, 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 3.mat.meta b/Assets/Resources/Fonts/WarioWareV2 SDF 3.mat.meta new file mode 100644 index 000000000..869f7aebd --- /dev/null +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 131dc823f1ff8e947985d9b9da4622df +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF 4.mat b/Assets/Resources/Fonts/WarioWareV2 SDF 4.mat new file mode 100644 index 000000000..14db4ee9c --- /dev/null +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 4.mat @@ -0,0 +1,120 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_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, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 0} + 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 + - _MaskEdgeSoftness: 0.01 + - _MaskInverse: 0 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _MaskWipeControl: 0.5 + - _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} + - _MaskEdgeColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0.105882354, b: 1, 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 4.mat.meta b/Assets/Resources/Fonts/WarioWareV2 SDF 4.mat.meta new file mode 100644 index 000000000..d68fb8f7e --- /dev/null +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 4.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 24d0a9ca5cfbd304ab20e5f8bad1e021 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF 5.mat b/Assets/Resources/Fonts/WarioWareV2 SDF 5.mat new file mode 100644 index 000000000..1ab63a7b8 --- /dev/null +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 5.mat @@ -0,0 +1,120 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_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, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 0} + 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 + - _MaskEdgeSoftness: 0.01 + - _MaskInverse: 0 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _MaskWipeControl: 0.5 + - _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} + - _MaskEdgeColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0.105882354, b: 1, 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 5.mat.meta b/Assets/Resources/Fonts/WarioWareV2 SDF 5.mat.meta new file mode 100644 index 000000000..dbeb9863f --- /dev/null +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 5.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b1901940ca0e0a342bdd90b6b6cd2a64 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF.asset b/Assets/Resources/Fonts/WarioWareV2 SDF.asset index 48d258567..57bd78af6 100644 --- a/Assets/Resources/Fonts/WarioWareV2 SDF.asset +++ b/Assets/Resources/Fonts/WarioWareV2 SDF.asset @@ -11,7 +11,6 @@ Material: m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} m_ValidKeywords: [] m_InvalidKeywords: - - MASK_SOFT - RATIOS_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -98,7 +97,7 @@ Material: - _WeightBold: 0.75 - _WeightNormal: 0 m_Colors: - - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _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} diff --git a/Assets/Resources/Games/bonOdori.prefab b/Assets/Resources/Games/bonOdori.prefab index c3252c628..68ca039e6 100644 --- a/Assets/Resources/Games/bonOdori.prefab +++ b/Assets/Resources/Games/bonOdori.prefab @@ -90,180 +90,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &240066348496992203 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7213038528357793729} - - component: {fileID: 7282541183034701209} - - component: {fileID: 4485031159704518370} - m_Layer: 0 - m_Name: Line4 (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7213038528357793729 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 240066348496992203} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 7, y: 7, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8473313144218655437} - 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} - m_AnchoredPosition: {x: 68.10008, y: -1.1499939} - m_SizeDelta: {x: 20, y: 0.1389} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &7282541183034701209 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 240066348496992203} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 8b63da5434a0b344992871b6ab04c081, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 999 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4485031159704518370 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 240066348496992203} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 8b63da5434a0b344992871b6ab04c081, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 1.25 - m_fontSizeBase: 1.25 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -0.59575295, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 7282541183034701209} - m_maskType: 0 --- !u!1 &259247702714142204 GameObject: m_ObjectHideFlags: 0 @@ -574,7 +400,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 7f924b6d4b4e7ca48b2e81603e0a82a1, type: 2} + - {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -618,8 +444,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 7f924b6d4b4e7ca48b2e81603e0a82a1, type: 2} + m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_sharedMaterial: {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -809,8 +635,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 69.54, y: -2.649994} - m_SizeDelta: {x: 20, y: 0.1389} + m_AnchoredPosition: {x: 69.54, y: -2.65} + m_SizeDelta: {x: 20, y: 0.1659} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &1175415679131159901 MeshRenderer: @@ -832,7 +658,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 7f924b6d4b4e7ca48b2e81603e0a82a1, type: 2} + - {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -852,7 +678,7 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 999 + m_SortingOrder: 500 m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &4432835255591746386 MonoBehaviour: @@ -876,8 +702,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 7f924b6d4b4e7ca48b2e81603e0a82a1, type: 2} + m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_sharedMaterial: {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1568,180 +1394,6 @@ Transform: m_Father: {fileID: 1960765599488996696} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1804166379809758820 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2141123856096727070} - - component: {fileID: 6512558769865721060} - - component: {fileID: 1425661527306848156} - m_Layer: 0 - m_Name: Line2 (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2141123856096727070 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804166379809758820} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 7, y: 7, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8473313144218655437} - 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} - m_AnchoredPosition: {x: 65.00004, y: 1.75998} - m_SizeDelta: {x: 20, y: 0.1389} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &6512558769865721060 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804166379809758820} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 8b63da5434a0b344992871b6ab04c081, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 999 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1425661527306848156 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804166379809758820} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 8b63da5434a0b344992871b6ab04c081, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 1.25 - m_fontSizeBase: 1.25 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -0.59575295, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 6512558769865721060} - m_maskType: 0 --- !u!1 &1818863778207740733 GameObject: m_ObjectHideFlags: 0 @@ -3653,6 +3305,180 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3271968271116934748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3070629536816959270} + - component: {fileID: 1523812738411127706} + - component: {fileID: 8349862543443832795} + m_Layer: 0 + m_Name: 'Line2Blue ' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3070629536816959270 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3271968271116934748} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 7, y: 7, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8473313144218655437} + 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} + m_AnchoredPosition: {x: 64.85342, y: 1.759979} + m_SizeDelta: {x: 19.9581, y: 0.1659} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &1523812738411127706 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3271968271116934748} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 42519c954cb2f3d4994c58eb3a10c89e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 501 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &8349862543443832795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3271968271116934748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 42519c954cb2f3d4994c58eb3a10c89e, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 1.25 + m_fontSizeBase: 1.25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: -0.59575295, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1523812738411127706} + m_maskType: 0 --- !u!1 &3378073592788851950 GameObject: m_ObjectHideFlags: 0 @@ -3863,7 +3689,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 66.55999, y: 0.29000854} - m_SizeDelta: {x: 20, y: 0.1389} + m_SizeDelta: {x: 20, y: 0.1659} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &553146290355354537 MeshRenderer: @@ -3885,7 +3711,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 7f924b6d4b4e7ca48b2e81603e0a82a1, type: 2} + - {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3905,7 +3731,7 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 999 + m_SortingOrder: 500 m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &8350271461529654393 MonoBehaviour: @@ -3929,8 +3755,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 7f924b6d4b4e7ca48b2e81603e0a82a1, type: 2} + m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_sharedMaterial: {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -4731,8 +4557,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 64.99999, y: 1.7599792} - m_SizeDelta: {x: 20, y: 0.1389} + m_AnchoredPosition: {x: 65, y: 1.76} + m_SizeDelta: {x: 20, y: 0.1659} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &8925827856042387405 MeshRenderer: @@ -4754,7 +4580,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 7f924b6d4b4e7ca48b2e81603e0a82a1, type: 2} + - {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4774,7 +4600,7 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 999 + m_SortingOrder: 500 m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &2481203004402812238 MonoBehaviour: @@ -4798,8 +4624,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 7f924b6d4b4e7ca48b2e81603e0a82a1, type: 2} + m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_sharedMaterial: {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5464,6 +5290,180 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &5127501538448471922 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 392734652595288100} + - component: {fileID: 8186847382533093879} + - component: {fileID: 964903139672564571} + m_Layer: 0 + m_Name: Line5Blue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &392734652595288100 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5127501538448471922} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 7, y: 7, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8473313144218655437} + 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} + m_AnchoredPosition: {x: 69.44801, y: -2.65} + m_SizeDelta: {x: 19.9737, y: 0.1659} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &8186847382533093879 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5127501538448471922} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b1901940ca0e0a342bdd90b6b6cd2a64, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 501 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &964903139672564571 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5127501538448471922} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: b1901940ca0e0a342bdd90b6b6cd2a64, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 1.25 + m_fontSizeBase: 1.25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: -0.59575295, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 8186847382533093879} + m_maskType: 0 --- !u!1 &5193313398745155610 GameObject: m_ObjectHideFlags: 0 @@ -5896,6 +5896,180 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &5594950355478083888 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8895179119127956590} + - component: {fileID: 6797992428246162971} + - component: {fileID: 8377596423482452501} + m_Layer: 0 + m_Name: Line3Blue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8895179119127956590 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5594950355478083888} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 7, y: 7, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8473313144218655437} + 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} + m_AnchoredPosition: {x: 66.348694, y: 0.29056975} + m_SizeDelta: {x: 19.9397, y: 0.1659} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &6797992428246162971 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5594950355478083888} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 131dc823f1ff8e947985d9b9da4622df, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 501 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &8377596423482452501 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5594950355478083888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 131dc823f1ff8e947985d9b9da4622df, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 1.25 + m_fontSizeBase: 1.25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: -0.59575295, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 6797992428246162971} + m_maskType: 0 --- !u!1 &5650864533110335097 GameObject: m_ObjectHideFlags: 0 @@ -6604,7 +6778,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 68.1, y: -1.1499939} - m_SizeDelta: {x: 20, y: 0.1389} + m_SizeDelta: {x: 20, y: 0.1659} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &154771235861463424 MeshRenderer: @@ -6626,7 +6800,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 7f924b6d4b4e7ca48b2e81603e0a82a1, type: 2} + - {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6646,7 +6820,7 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 999 + m_SortingOrder: 500 m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &3818873790566735953 MonoBehaviour: @@ -6670,8 +6844,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 7f924b6d4b4e7ca48b2e81603e0a82a1, type: 2} + m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_sharedMaterial: {fileID: -5366929467905383303, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6862,10 +7036,10 @@ Transform: - {fileID: 4389590328865582082} - {fileID: 3859919625309255425} - {fileID: 7025149057808423635} - - {fileID: 2141123856096727070} - - {fileID: 3994050857099161038} - - {fileID: 7213038528357793729} - - {fileID: 8940577750127081622} + - {fileID: 3070629536816959270} + - {fileID: 8895179119127956590} + - {fileID: 6419318073471297395} + - {fileID: 392734652595288100} - {fileID: 8387568492357112863} - {fileID: 298275253940792191} - {fileID: 8867001238483373209} @@ -6919,10 +7093,10 @@ MonoBehaviour: Text4: {fileID: 3818873790566735953} Text5: {fileID: 4432835255591746386} Text6: {fileID: 7417688239478088680} - Text7: {fileID: 1425661527306848156} - Text8: {fileID: 8034254980374276970} - Text9: {fileID: 4485031159704518370} - Text10: {fileID: 7880845857083615224} + Text7: {fileID: 8349862543443832795} + Text8: {fileID: 8377596423482452501} + Text9: {fileID: 6822964464956298578} + Text10: {fileID: 964903139672564571} DarkPlane: {fileID: 8600589182512249935} Player: {fileID: 8728714290611780215} Judge: {fileID: 7587793407961933664} @@ -7908,180 +8082,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &6595958549944445135 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8940577750127081622} - - component: {fileID: 2621447870714962272} - - component: {fileID: 7880845857083615224} - m_Layer: 0 - m_Name: Line5 (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8940577750127081622 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6595958549944445135} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 7, y: 7, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8473313144218655437} - 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} - m_AnchoredPosition: {x: 69.54001, y: -2.6499949} - m_SizeDelta: {x: 20, y: 0.1389} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &2621447870714962272 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6595958549944445135} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 8b63da5434a0b344992871b6ab04c081, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 999 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &7880845857083615224 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6595958549944445135} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 8b63da5434a0b344992871b6ab04c081, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 1.25 - m_fontSizeBase: 1.25 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -0.59575295, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2621447870714962272} - m_maskType: 0 --- !u!1 &6657873060536999734 GameObject: m_ObjectHideFlags: 0 @@ -8955,180 +8955,6 @@ Transform: m_Father: {fileID: 8867001238483373209} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7503079846900439257 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3994050857099161038} - - component: {fileID: 3651776273371939824} - - component: {fileID: 8034254980374276970} - m_Layer: 0 - m_Name: Line3 (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3994050857099161038 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7503079846900439257} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 7, y: 7, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8473313144218655437} - 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} - m_AnchoredPosition: {x: 66.56002, y: 0.29000902} - m_SizeDelta: {x: 20, y: 0.1389} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &3651776273371939824 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7503079846900439257} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 8b63da5434a0b344992871b6ab04c081, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 999 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8034254980374276970 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7503079846900439257} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 8b63da5434a0b344992871b6ab04c081, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 1.25 - m_fontSizeBase: 1.25 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 0 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -0.59575295, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 3651776273371939824} - m_maskType: 0 --- !u!1 &7509324510303429437 GameObject: m_ObjectHideFlags: 0 @@ -9330,6 +9156,180 @@ Transform: m_Father: {fileID: 2258391813358905482} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7593753107224821126 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6419318073471297395} + - component: {fileID: 2876033393415236372} + - component: {fileID: 6822964464956298578} + m_Layer: 0 + m_Name: Line4Blue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6419318073471297395 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7593753107224821126} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 7, y: 7, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8473313144218655437} + 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} + m_AnchoredPosition: {x: 67.8433, y: -1.1486} + m_SizeDelta: {x: 19.9265, y: 0.1659} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &2876033393415236372 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7593753107224821126} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 24d0a9ca5cfbd304ab20e5f8bad1e021, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 501 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &6822964464956298578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7593753107224821126} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 24d0a9ca5cfbd304ab20e5f8bad1e021, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 1.25 + m_fontSizeBase: 1.25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: -0.59575295, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2876033393415236372} + m_maskType: 0 --- !u!1 &7667114622078047801 GameObject: m_ObjectHideFlags: 0 @@ -9374,7 +9374,7 @@ GameObject: - component: {fileID: 8117257725616039388} - component: {fileID: 7417688239478088680} m_Layer: 0 - m_Name: Line1 (1) + m_Name: Line1Blue m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -9397,8 +9397,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 63.19003, y: 3.269981} - m_SizeDelta: {x: 20, y: 0.1659} + m_AnchoredPosition: {x: 62.947075, y: 3.268} + m_SizeDelta: {x: 19.9307, y: 0.1659} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &8117257725616039388 MeshRenderer: @@ -9420,7 +9420,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 8b63da5434a0b344992871b6ab04c081, type: 2} + - {fileID: 2100000, guid: c4b8a644bebf7844ba934921adfad6a8, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9440,7 +9440,7 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 500 + m_SortingOrder: 501 m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &7417688239478088680 MonoBehaviour: @@ -9464,8 +9464,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 8b63da5434a0b344992871b6ab04c081, type: 2} + m_fontAsset: {fileID: 11400000, guid: b4806f15343a2e74597397032ccfc8f7, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: c4b8a644bebf7844ba934921adfad6a8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -11368,7 +11368,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5889235554194345478, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} propertyPath: m_SizeDelta.y - value: 0.1389 + value: 0.1659 objectReference: {fileID: 0} - target: {fileID: 5889235554194345478, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} propertyPath: m_LocalScale.x @@ -11426,6 +11426,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6462503663710011989, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} - target: {fileID: 6462503663710011989, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} propertyPath: m_fontSize value: 1.25 @@ -11440,7 +11444,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7972181244651385017, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} propertyPath: m_SortingOrder - value: 999 + value: 500 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} @@ -11451,6 +11455,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8473313144218655437} m_Modifications: + - target: {fileID: 1641870889898324944, guid: 43ca3d2d8933184468fb0f9f68f581a4, type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} - target: {fileID: 1641870889898324944, guid: 43ca3d2d8933184468fb0f9f68f581a4, type: 3} propertyPath: m_fontSize value: 1.25 @@ -11465,7 +11473,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3094036397285963773, guid: 43ca3d2d8933184468fb0f9f68f581a4, type: 3} propertyPath: m_SortingOrder - value: 999 + value: 500 objectReference: {fileID: 0} - target: {fileID: 6352131161661567087, guid: 43ca3d2d8933184468fb0f9f68f581a4, type: 3} propertyPath: m_Pivot.x @@ -11501,7 +11509,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6352131161661567087, guid: 43ca3d2d8933184468fb0f9f68f581a4, type: 3} propertyPath: m_SizeDelta.y - value: 0.1389 + value: 0.1659 objectReference: {fileID: 0} - target: {fileID: 6352131161661567087, guid: 43ca3d2d8933184468fb0f9f68f581a4, type: 3} propertyPath: m_LocalScale.x @@ -11719,7 +11727,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5889235554194345478, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} propertyPath: m_SizeDelta.y - value: 0.1389 + value: 0.1659 objectReference: {fileID: 0} - target: {fileID: 5889235554194345478, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} propertyPath: m_LocalScale.x @@ -11773,6 +11781,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6462503663710011989, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} - target: {fileID: 6462503663710011989, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} propertyPath: m_fontSize value: 1.25 @@ -11787,7 +11799,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7972181244651385017, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} propertyPath: m_SortingOrder - value: 999 + value: 500 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} @@ -11958,7 +11970,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5889235554194345478, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} propertyPath: m_SizeDelta.y - value: 0.1389 + value: 0.1659 objectReference: {fileID: 0} - target: {fileID: 5889235554194345478, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} propertyPath: m_LocalScale.x @@ -12016,6 +12028,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6462503663710011989, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} - target: {fileID: 6462503663710011989, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} propertyPath: m_fontSize value: 1.25 @@ -12030,7 +12046,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7972181244651385017, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} propertyPath: m_SortingOrder - value: 999 + value: 500 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3905892c51dd1fc4f955d699074493c3, type: 3} diff --git a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture index 5c8c7eace..b27548060 100644 --- a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture +++ b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 852 - m_Height: 479 + m_Width: 572 + m_Height: 322 m_AntiAliasing: 2 m_MipCount: -1 m_DepthStencilFormat: 92 diff --git a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture index 4bf831dd6..278edea9b 100644 --- a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture +++ b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 1278 - m_Height: 718 + m_Width: 858 + m_Height: 483 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 92 diff --git a/Assets/Resources/Sprites/Games/BonOdori/Animations/Players/Bow.anim b/Assets/Resources/Sprites/Games/BonOdori/Animations/Players/Bow.anim index 6c7fb4062..db8850368 100644 --- a/Assets/Resources/Sprites/Games/BonOdori/Animations/Players/Bow.anim +++ b/Assets/Resources/Sprites/Games/BonOdori/Animations/Players/Bow.anim @@ -1357,7 +1357,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 0e272e587..01514e411 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -8906,7 +8906,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 1.35 + m_fontSize: 4.35 m_fontSizeBase: 14.3 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -26851,7 +26851,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1589389271} m_Direction: 2 m_Value: 1 - m_Size: 0.36602464 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -32707,7 +32707,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 84.949974} + m_AnchoredPosition: {x: 0, y: 44.36734} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1154875945 @@ -43455,8 +43455,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1220118245} m_HandleRect: {fileID: 1220118244} m_Direction: 2 - m_Value: 1.0000002 - m_Size: 0.312933 + m_Value: 1.0000001 + m_Size: 0 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/Assets/Scripts/Games/BonOdori/BonOdori.cs b/Assets/Scripts/Games/BonOdori/BonOdori.cs index e21507549..36dbf818d 100644 --- a/Assets/Scripts/Games/BonOdori/BonOdori.cs +++ b/Assets/Scripts/Games/BonOdori/BonOdori.cs @@ -88,8 +88,8 @@ namespace HeavenStudio.Games.Loaders }, new GameAction("show text", "Show Text") { - function = delegate {BonOdori.instance.ShowText(eventCaller.currentEntity["line 1"], eventCaller.currentEntity["line 2"], eventCaller.currentEntity["line 3"], eventCaller.currentEntity["line 4"], eventCaller.currentEntity["line 5"],eventCaller.currentEntity["font"]);}, - defaultLength = 0.5f, + function = delegate {BonOdori.instance.ShowText(eventCaller.currentEntity["line 1"], eventCaller.currentEntity["line 2"], eventCaller.currentEntity["line 3"], eventCaller.currentEntity["line 4"], eventCaller.currentEntity["line 5"]);}, + defaultLength = 1f, parameters = new List() { new Param("whichLine", new EntityTypes.Integer(1,5,1), "Line", "Which line to modify.", new(){ new((x, _) => (int)x == 1, new string[] { "line 1"}), @@ -98,12 +98,12 @@ namespace HeavenStudio.Games.Loaders new((x, _) => (int)x == 4, new string[] { "line 4"}), new((x, _) => (int)x == 5, new string[] { "line 5"}), }), - new Param("line 1", "Type r| for red text, g| for green text and y| for yellow text. These can be used multiple times in a single line", "Line 1", "Set the text for line 1."), + new Param("line 1", "Type r| for red text, g| for green text and y| for yellow text. These can be used multiple times in a single line.", "Line 1", "Set the text for line 1."), new Param("line 2", "", "Line 2", "Set the text for line 2."), new Param("line 3", "", "Line 3", "Set the text for line 3.y"), new Param("line 4", "", "Line 4", "Set the text for line 4."), new Param("line 5", "", "Line 5", "Set the text for line 5."), - new Param("font", BonOdori.font.RodinProDb, "font", "Set the font for the text") + @@ -113,7 +113,7 @@ namespace HeavenStudio.Games.Loaders new GameAction("delete text", "Delete Text") { function = delegate {BonOdori.instance.DeleteText(eventCaller.currentEntity["line 1"],eventCaller.currentEntity["line 2"],eventCaller.currentEntity["line 3"],eventCaller.currentEntity["line 4"],eventCaller.currentEntity["line 5"]);}, - defaultLength = 0.5f, + defaultLength = 1f, parameters = new List() { new Param("line 1", false, "Line 1", "Delete the contents of line 1."), @@ -138,6 +138,12 @@ namespace HeavenStudio.Games.Loaders new Param("line 5", false, "Line 5", "Scroll the contents of line 5."), }, + }, + new GameAction("bow", "Bow") + { + function = delegate {BonOdori.instance.Bow(eventCaller.currentEntity.beat);}, + defaultLength = 2f, + } @@ -189,11 +195,7 @@ namespace HeavenStudio.Games [SerializeField] Animator CPU; [SerializeField] Animator Face; - public enum font - { - RodinProDb = 0, - WarioWareV2 = 1 - } + public enum color { red = 0, @@ -414,36 +416,11 @@ namespace HeavenStudio.Games } - public void ShowText(string text1, string text2, string text3, string text4, string text5, int font) - { Text6.GetComponent().SetMask(0, new Vector4(-10f, -10f, -10f, 10)); - if (font == 0) - { - Text1.GetComponent().font = RodinDB; - Text2.GetComponent().font = RodinDB; - Text3.GetComponent().font = RodinDB; - Text4.GetComponent().font = RodinDB; - Text5.GetComponent().font = RodinDB; - Text6.GetComponent().font = RodinDB; - Text7.GetComponent().font = RodinDB; - Text8.GetComponent().font = RodinDB; - Text9.GetComponent().font = RodinDB; - Text10.GetComponent().font = RodinDB; -; - } - if (font == 1) - { - Text1.GetComponent().font = WW; - Text2.GetComponent().font = WW; - Text3.GetComponent().font = WW; - Text4.GetComponent().font = WW; - Text5.GetComponent().font = WW; - Text6.GetComponent().font = WW; - Text7.GetComponent().font = WW; - Text8.GetComponent().font = WW; - Text9.GetComponent().font = WW; - Text10.GetComponent().font = WW; - } - + public void ShowText(string text1, string text2, string text3, string text4, string text5) + { + + + @@ -455,31 +432,46 @@ 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 (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."){ + Text6.GetComponent().SetMask(0, new Vector4(-10f, -10f, -10f, 10)); text1 = ChangeColor(text1); + Text1.text = text1; + ; Text6.text = text1; } if (text2 is not ""){ + Text7.GetComponent().SetMask(0, new Vector4(-10f, -10f, -10f, 10)); text2 = ChangeColor(text2); Text2.text = text2; + Text7.text = text2; } - if (text3 != ""){ + if (text3 is not ""){ + + Text8.GetComponent().SetMask(0, new Vector4(-10f, -10f, -10f, 10)); + text3 = ChangeColor(text3); - Text3.text = text3; + + Text3.text = text3; + Text8.text = text3; } - if (text4 != ""){ + if (text4 is not ""){ + Text9.GetComponent().SetMask(0, new Vector4(-10f, -10f, -10f, 10)); text4 = ChangeColor(text4); - Text4.text = text4; + Text4.text = text4; + + Text9.text = text4; } - if (text5 != ""){ + if (text5 is not ""){ + Text10.GetComponent().SetMask(0, new Vector4(-10f, -10f, -10f, 10)); text5 = ChangeColor(text5); Text5.text = text5; + Text10.text = text5; } @@ -509,30 +501,52 @@ namespace HeavenStudio.Games } } -IEnumerator scroll(float startVal, float endVal, float seconds) + IEnumerator SmoothText(TMP_Text text, float length) { - float currentVal = startVal; - for (float t= 0.0f; t<1.0f;t+= Time.deltaTime / seconds) + float startTime = Time.time; + float endTime = startTime + length; + + while (Time.time < endTime) { - var coords = new Vector4(-10f, -10f, Mathf.Lerp(currentVal, endVal, t), -10f); - Text6.GetComponent().SetMask(0,coords); + float t = ((Time.time - startTime) *3); + float maskValue = Mathf.Lerp(-10f, -7.73f, t / length); + + text.GetComponent().SetMask(0, new Vector4(-10, -10, maskValue, 10)); + yield return null; } + + + } -public void ScrollText(bool text1, bool text2, bool text3, bool text4, bool text5, float length) -{ - StartCoroutine(scroll(-10f, -7f, 5f)); - - - - + public void ScrollText(bool text1, bool text2, bool text3, bool text4, bool text5, float length) + { + if (text1){ + StartCoroutine(SmoothText(Text6, length));} + if (text2){ + StartCoroutine(SmoothText(Text7, length));} + if (text3){ + StartCoroutine(SmoothText(Text8, length));} + if (text4){ + StartCoroutine(SmoothText(Text9, length));} + if (text5){ + StartCoroutine(SmoothText(Text10, length));} + } - public void Bop(double beat, double length, bool bop, bool auto) { } + public void Bow(double beat) + { + Player.Play("Bow"); + CPU.Play("Bow"); + BeatAction.New(instance, new List() + { + new BeatAction.Action(beat + 2, delegate { Player.Play("NeutralBopped"); }) + }); + }