From 4560302fb9c2c34f0310f86c990470f5fea7bccc Mon Sep 17 00:00:00 2001 From: Avibah Date: Sat, 9 Mar 2024 15:06:41 -0600 Subject: [PATCH] change version --- Editor/New SSQE/MainWindow.cs | 13 +++++++------ Editor/New SSQE/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Editor/New SSQE/MainWindow.cs b/Editor/New SSQE/MainWindow.cs index 604f951..8b27249 100644 --- a/Editor/New SSQE/MainWindow.cs +++ b/Editor/New SSQE/MainWindow.cs @@ -2619,9 +2619,10 @@ public string RunOSUImport(string path) for (int i = 0; i < split.Length; i++) { + string line = split[i].Trim(); + try { - string line = split[i].Trim(); string[] subsplit = line.Split(":"); string[] set = line.Split(","); @@ -2633,7 +2634,7 @@ public string RunOSUImport(string path) File.Copy($"{Path.GetDirectoryName(path)}\\{idPath}", $"cached/{id}.asset", true); } - if (timing && !string.IsNullOrWhiteSpace(line) && set.Length > 1) + if (timing && !string.IsNullOrWhiteSpace(line)) { bool canParse = double.TryParse(set[0], NumberStyles.Any, culture, out double time); canParse &= float.TryParse(set[1], NumberStyles.Any, culture, out float bpm); @@ -2649,7 +2650,7 @@ public string RunOSUImport(string path) } } - if (hitObj && !string.IsNullOrWhiteSpace(line) && set.Length > 3) + if (hitObj && !string.IsNullOrWhiteSpace(line)) { bool canParse = float.TryParse(set[0], NumberStyles.Any, culture, out float x); canParse &= float.TryParse(set[1], NumberStyles.Any, culture, out float y); @@ -2665,11 +2666,11 @@ public string RunOSUImport(string path) mapData += $",{Math.Round(x, 2)}|{Math.Round(y, 2)}|{(long)time}"; } } - - timing = line != "[HitObjects]" && (timing || line == "[TimingPoints]"); - hitObj = line != "[TimingPoints]" && (hitObj || line == "[HitObjects]"); } catch { } + + timing = line != "[HitObjects]" && (timing || line == "[TimingPoints]"); + hitObj = line != "[TimingPoints]" && (hitObj || line == "[HitObjects]"); } return id + mapData; diff --git a/Editor/New SSQE/Properties/AssemblyInfo.cs b/Editor/New SSQE/Properties/AssemblyInfo.cs index 0204a76..4f4867b 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.4.3")] -[assembly: AssemblyFileVersion("2.1.4.3")] +[assembly: AssemblyVersion("2.1.4.4")] +[assembly: AssemblyFileVersion("2.1.4.4")]