From 0da99871e2ef4eaed7e09715680f8f0cb47d9780 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Mon, 18 Dec 2023 15:48:05 -0500 Subject: [PATCH] adjust open captions material no dotted BG in results commentary (only epilogue) bugfix for tempo / volume scroll --- .../Fonts/rodin/FOT-Rodin Pro B SDF Open Captions.mat | 8 +++++--- Assets/Scenes/Game.unity | 4 ++++ Assets/Scripts/JudgementManager.cs | 2 +- .../LevelEditor/Timeline/SpecialTmeline/TempoDialog.cs | 2 +- .../LevelEditor/Timeline/SpecialTmeline/VolumeDialog.cs | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Open Captions.mat b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Open Captions.mat index 4cfbf737a..623dfddc1 100644 --- a/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Open Captions.mat +++ b/Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Open Captions.mat @@ -2,14 +2,15 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: FOT-Rodin Pro B SDF Open Captions m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} - m_ShaderKeywords: + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -39,6 +40,7 @@ Material: 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 @@ -65,7 +67,7 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.4 + - _OutlineWidth: 0.5 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - _ScaleRatioA: 0.9 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index ff6c5b02a..0f0c31009 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -190,6 +190,10 @@ PrefabInstance: propertyPath: m_Layer value: 31 objectReference: {fileID: 0} + - target: {fileID: 657067078569207447, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 657067078740753795, guid: 75ce9c0b59ff27f46a011e0cafc17fb3, type: 3} propertyPath: m_Layer value: 31 diff --git a/Assets/Scripts/JudgementManager.cs b/Assets/Scripts/JudgementManager.cs index 04605e757..989e14304 100644 --- a/Assets/Scripts/JudgementManager.cs +++ b/Assets/Scripts/JudgementManager.cs @@ -434,7 +434,7 @@ namespace HeavenStudio public void ShowRank() { rankLogo.SetActive(true); - bg.SetActive(true); + // bg.SetActive(true); if (rank == Rank.Ng) { rankAnim.Play("Ng"); diff --git a/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TempoDialog.cs b/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TempoDialog.cs index 9d8824777..6d081df17 100644 --- a/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TempoDialog.cs +++ b/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TempoDialog.cs @@ -33,7 +33,7 @@ public class TempoDialog : Dialog void Update() { - if (tempoObj != null && tempoObj.first) + if (tempoObj != null) { tempoInput.text = tempoObj.chartEntity["tempo"].ToString("F"); } diff --git a/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/VolumeDialog.cs b/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/VolumeDialog.cs index 19f2c2efa..dc91a34ea 100644 --- a/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/VolumeDialog.cs +++ b/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/VolumeDialog.cs @@ -37,7 +37,7 @@ public class VolumeDialog : Dialog void Update() { - if (volumeObj != null && volumeObj.first) + if (volumeObj != null) { volumeInput.text = volumeObj.chartEntity["volume"].ToString("F"); }