diff --git a/Editor/New SSQE/GUI/GuiGrid.cs b/Editor/New SSQE/GUI/GuiGrid.cs index 6af4a21..960b162 100644 --- a/Editor/New SSQE/GUI/GuiGrid.cs +++ b/Editor/New SSQE/GUI/GuiGrid.cs @@ -145,11 +145,11 @@ public override void GenerateOffsets() if (gridNumbers) { var numText = $"{i + 1:##,###}"; - var width = FontRenderer.GetWidth(numText, 24, "main"); - var height = FontRenderer.GetHeight(24, "main"); + var width = FontRenderer.GetWidth(numText, 28, "main"); + var height = FontRenderer.GetHeight(28, "main"); - color2Texts.AddRange(FontRenderer.Print((int)(noteRect.X + noteRect.Width / 2f - width / 2f), (int)(noteRect.Y + noteRect.Height / 2f - height / 2f + 3f), - numText, 24, "main")); + color2Texts.AddRange(FontRenderer.Print((int)(noteRect.X + noteRect.Width / 2f - width / 2f), (int)(noteRect.Y + noteRect.Height / 2f - height / 2f), + numText, 28, "main")); for (int j = 0; j < numText.Length; j++) alphas.Add(1 - progress); } diff --git a/Editor/New SSQE/GUI/GuiTrack.cs b/Editor/New SSQE/GUI/GuiTrack.cs index 7c06614..3291641 100644 --- a/Editor/New SSQE/GUI/GuiTrack.cs +++ b/Editor/New SSQE/GUI/GuiTrack.cs @@ -234,8 +234,8 @@ public override void GenerateOffsets() var numText = $"Note {i + 1:##,###}"; var msText = $"{note.Ms:##,##0}ms"; - color1Texts.AddRange(FontRenderer.Print((int)x + 3, (int)Rect.Height, numText, 16, "main")); - color2Texts.AddRange(FontRenderer.Print((int)x + 3, (int)Rect.Height + 15, msText, 16, "main")); + color1Texts.AddRange(FontRenderer.Print((int)x + 3, (int)Rect.Height - 2, numText, 20, "main")); + color2Texts.AddRange(FontRenderer.Print((int)x + 3, (int)Rect.Height + 13, msText, 20, "main")); lastRendered = x; } @@ -335,8 +335,8 @@ public override void GenerateOffsets() var numText = $"{point.BPM:##,###.###} BPM"; var msText = $"{point.Ms:##,##0}ms"; - color1Texts.AddRange(FontRenderer.Print((int)lineX + 3, (int)Rect.Height + 28, numText, 16, "main")); - color2Texts.AddRange(FontRenderer.Print((int)lineX + 3, (int)Rect.Height + 43, msText, 16, "main")); + color1Texts.AddRange(FontRenderer.Print((int)lineX + 3, (int)Rect.Height + 26, numText, 20, "main")); + color2Texts.AddRange(FontRenderer.Print((int)lineX + 3, (int)Rect.Height + 41, msText, 20, "main")); if (hovering) { diff --git a/Editor/New SSQE/MainWindow.cs b/Editor/New SSQE/MainWindow.cs index 8b27249..ca86dd6 100644 --- a/Editor/New SSQE/MainWindow.cs +++ b/Editor/New SSQE/MainWindow.cs @@ -163,7 +163,7 @@ public void UpdateFPS(VSyncMode mode) protected override void OnLoad() { GL.ClearColor(0f, 0f, 0f, 1f); - + GL.Enable(EnableCap.Blend); GL.BlendFunc(BlendingFactor.SrcAlpha, BlendingFactor.OneMinusSrcAlpha); } diff --git a/Editor/New SSQE/Properties/AssemblyInfo.cs b/Editor/New SSQE/Properties/AssemblyInfo.cs index 1e35438..78819f4 100644 --- a/Editor/New SSQE/Properties/AssemblyInfo.cs +++ b/Editor/New SSQE/Properties/AssemblyInfo.cs @@ -13,5 +13,5 @@ [assembly: ComVisible(false)] [assembly: Guid("9a405608-105f-473a-8f17-9d8c05f82b19")] -[assembly: AssemblyVersion("2.1.5.0")] -[assembly: AssemblyFileVersion("2.1.5.0")] +[assembly: AssemblyVersion("2.1.5.1")] +[assembly: AssemblyFileVersion("2.1.5.1")] diff --git a/Map Player/SSQE Player/obj/Debug/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig b/Map Player/SSQE Player/obj/Debug/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig index 263923e..c2eaf61 100644 --- a/Map Player/SSQE Player/obj/Debug/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig +++ b/Map Player/SSQE Player/obj/Debug/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig @@ -1,4 +1,8 @@ is_global = true +build_property.EnableAotAnalyzer = +build_property.EnableSingleFileAnalyzer = +build_property.EnableTrimAnalyzer = +build_property.IncludeAllContentForSelfExtract = build_property.TargetFramework = net6.0 build_property.TargetPlatformMinVersion = build_property.UsingMicrosoftNETSdkWeb = diff --git a/Map Player/SSQE Player/obj/Debug/net6.0/SSQE Player.assets.cache b/Map Player/SSQE Player/obj/Debug/net6.0/SSQE Player.assets.cache index 092772a..b2318d4 100644 Binary files a/Map Player/SSQE Player/obj/Debug/net6.0/SSQE Player.assets.cache and b/Map Player/SSQE Player/obj/Debug/net6.0/SSQE Player.assets.cache differ diff --git a/Map Player/SSQE Player/obj/Release/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig b/Map Player/SSQE Player/obj/Release/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig index 263923e..c2eaf61 100644 --- a/Map Player/SSQE Player/obj/Release/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig +++ b/Map Player/SSQE Player/obj/Release/net6.0/SSQE Player.GeneratedMSBuildEditorConfig.editorconfig @@ -1,4 +1,8 @@ is_global = true +build_property.EnableAotAnalyzer = +build_property.EnableSingleFileAnalyzer = +build_property.EnableTrimAnalyzer = +build_property.IncludeAllContentForSelfExtract = build_property.TargetFramework = net6.0 build_property.TargetPlatformMinVersion = build_property.UsingMicrosoftNETSdkWeb = diff --git a/Map Player/SSQE Player/obj/Release/net6.0/SSQE Player.assets.cache b/Map Player/SSQE Player/obj/Release/net6.0/SSQE Player.assets.cache index e927273..6b8e673 100644 Binary files a/Map Player/SSQE Player/obj/Release/net6.0/SSQE Player.assets.cache and b/Map Player/SSQE Player/obj/Release/net6.0/SSQE Player.assets.cache differ