[R] Chart相关重构（第二步）——使用BaseChart中提供的List对象

Starrah · Starrah · commit 84a39e5102bd · 2026-05-03T23:50:53.000+08:00
diff --git a/chart/chu/C2sChart.cs b/chart/chu/C2sChart.cs
@@ -1,4 +1,5 @@
 using MuConvert.chart;
+using Rationals;
 
 namespace MuConvert.chu;
 
@@ -15,7 +16,5 @@ public class C2sChart : BaseChart<ChuNote>, IChuChart
     public decimal Level { get; set; } // 定数，小数
     public string MusicId { get; set; } = "0";
     public int Resolution { get; set; } = 384;
-    public List<(int Measure, int Offset, double Bpm)> BpmEvents = [];
-    public List<(int Measure, int Offset, int Denom, int Num)> MetEvents = [];
-    public List<(int Measure, int Offset, int Duration, double Multiplier)> SflEvents = [];
+    public List<(Rational Time, Rational Duration, decimal Multiplier)> SflList = []; // 所有变速声明构成的列表。
 }
diff --git a/chart/chu/SusChart.cs b/chart/chu/SusChart.cs
@@ -11,5 +11,4 @@ public class SusChart : BaseChart<ChuNote>, IChuChart
     public string Artist { get; set; } = "";
     public string Designer { get; set; } = "";
     public int TicksPerBeat { get; set; } = 480;
-    public List<(int Measure, int Offset, double Bpm)> BpmEvents = [];
 }
diff --git a/chart/chu/UgcChart.cs b/chart/chu/UgcChart.cs
@@ -1,4 +1,5 @@
 using MuConvert.chart;
+using Rationals;
 
 namespace MuConvert.chu;
 
@@ -15,7 +16,5 @@ public class UgcChart : BaseChart<ChuNote>, IChuChart
     public decimal Level { get; set; }
     public string MusicId { get; set; } = "";
     public int TicksPerBeat { get; set; } = 480;
-    public List<(int Measure, int Num, int Den)> BeatEvents = [];
-    public List<(int Measure, int Offset, double Bpm)> BpmEvents = [];
-    public List<(int Measure, int Offset, double Multiplier)> SpeedEvents = [];
+    public List<(Rational Time, Rational Duration, decimal Multiplier)> SflList = []; // 所有变速声明构成的列表。
 }
diff --git a/generator/chu/C2sGenerator.cs b/generator/chu/C2sGenerator.cs
@@ -1,5 +1,6 @@
 using System.Globalization;
 using System.Text;
+using MuConvert.chart;
 using MuConvert.generator;
 using MuConvert.utils;
 using static MuConvert.utils.Alert.LEVEL;
@@ -12,8 +13,6 @@ namespace MuConvert.chu;
  */
 public class C2sGenerator : IGenerator<IChuChart>
 {
-    private const int C2sResolution = 384;
-
     public (string, List<Alert>) Generate(IChuChart chart)
     {
         var alerts = new List<Alert>();
@@ -32,18 +31,19 @@ private static C2sChart ConvertToC2s(IChuChart chart, List<Alert> alerts)
             {
                 Designer = ugc.Designer,
             };
-            foreach (var b in ugc.BpmEvents)
-                result.BpmEvents.Add((b.Measure, ScaleDown(b.Offset, ugc.TicksPerBeat), b.Bpm));
-            foreach (var b in ugc.BeatEvents)
-                result.MetEvents.Add((b.Measure, 0, b.Den, b.Num));
+            result.BpmList.AddRange(ugc.BpmList);
+            result.MetList.AddRange(ugc.MetList);
             result.Notes = ugc.Notes;
             return result;
         }
 
         if (chart is SusChart sus)
         {
             var result = new C2sChart();
-            // result.BpmEvents.Add((0, 0, sus.Bpm));
+            if (sus.BpmList.Count > 0)
+                result.BpmList.AddRange(sus.BpmList);
+            else
+                result.BpmList.Add(new BPM(0, 120m));
             result.Notes = sus.Notes;
             return result;
         }
@@ -52,8 +52,6 @@ private static C2sChart ConvertToC2s(IChuChart chart, List<Alert> alerts)
         throw new ConversionException(alerts);
     }
 
-    private static int ScaleDown(int ticks, int tpb) => (int)((long)ticks * (C2sResolution / 4) / tpb);
-
     private static string Serialize(C2sChart chart)
     {
         chart.Sort();
@@ -76,12 +74,25 @@ private static string Serialize(C2sChart chart)
         sb.AppendLine("TUTORIAL\t0");
         sb.AppendLine();
 
-        foreach (var b in chart.BpmEvents)
-            sb.AppendLine($"BPM\t{b.Measure}\t{b.Offset}\t{Fmt(b.Bpm)}");
-        foreach (var m in chart.MetEvents)
-            sb.AppendLine($"MET\t{m.Measure}\t{m.Offset}\t{m.Denom}\t{m.Num}");
-        foreach (var s in chart.SflEvents)
-            sb.AppendLine($"SFL\t{s.Measure}\t{s.Offset}\t{s.Duration}\t{Mlt(s.Multiplier)}");
+        var res = chart.Resolution;
+        foreach (var b in chart.BpmList)
+        {
+            var (m, o) = Utils.BarAndTick(b.Time, res);
+            sb.AppendLine($"BPM\t{m}\t{o}\t{b.Bpm:0.000}");
+        }
+
+        foreach (var met in chart.MetList)
+        {
+            var (m, o) = Utils.BarAndTick(met.Time, res);
+            sb.AppendLine($"MET\t{m}\t{o}\t{met.Denominator}\t{met.Numerator}");
+        }
+
+        foreach (var s in chart.SflList.OrderBy(s => s.Time))
+        {
+            var (m, o) = Utils.BarAndTick(s.Time, res);
+            var durTicks = Utils.Tick(s.Duration, res);
+            sb.AppendLine($"SFL\t{m}\t{o}\t{durTicks}\t{s.Multiplier:0.000000}");
+        }
         sb.AppendLine();
 
         foreach (var n in chart.Notes)
@@ -93,8 +104,8 @@ private static string Serialize(C2sChart chart)
 
     private static string FormatNote(ChuNote n, int tpm)
     {
-        var (m, o) = Utils.BarAndTick(n.Time, tpm, 0);
-        var durTicks = Utils.Tick(n.Duration, tpm, 0);
+        var (m, o) = Utils.BarAndTick(n.Time, tpm);
+        var durTicks = Utils.Tick(n.Duration, tpm);
         return n.Type switch
         {
             "TAP" => $"TAP\t{m}\t{o}\t{n.Cell}\t{n.Width}",
@@ -132,7 +143,4 @@ private static string FormatAld(ChuNote n, int m, int o)
         var tail = n.ExtraData.Count > 3 ? n.ExtraData[3] : 0;
         return $"ALD\t{m}\t{o}\t{n.Cell}\t{n.Width}\t{a}\t{b}\t{c}\t{n.EndCell}\t{n.EndWidth}\t{tail}";
     }
-
-    private static string Fmt(double v) => v.ToString("0.000", CultureInfo.InvariantCulture);
-    private static string Mlt(double v) => v.ToString("0.000000", CultureInfo.InvariantCulture);
 }
diff --git a/generator/chu/SusGenerator.cs b/generator/chu/SusGenerator.cs
@@ -1,4 +1,5 @@
 using System.Text;
+using MuConvert.chart;
 using MuConvert.generator;
 using MuConvert.utils;
 using static MuConvert.utils.Alert.LEVEL;
@@ -30,16 +31,18 @@ private static SusChart ConvertToSus(IChuChart chart, List<Alert> alerts)
 
         if (chart is C2sChart c2s)
         {
-            bpm = c2s.BpmEvents[0].Bpm;
+            bpm = c2s.BpmList.Count > 0 ? (double)c2s.BpmList[0].Bpm : 120.0;
             var result = new SusChart { TicksPerBeat = SusTpb, Title = title, Artist = artist };
+            result.BpmList.Add(new BPM(0, (decimal)bpm));
             result.Notes = c2s.Notes;
             return result;
         }
 
         if (chart is UgcChart ugc)
         {
-            bpm = ugc.BpmEvents.Count > 0 ? ugc.BpmEvents[0].Bpm : 120.0;
+            bpm = ugc.BpmList.Count > 0 ? (double)ugc.BpmList[0].Bpm : 120.0;
             var result = new SusChart { TicksPerBeat = SusTpb, Title = ugc.Title, Artist = ugc.Artist };
+            result.BpmList.Add(new BPM(0, (decimal)bpm));
             result.Notes = ugc.Notes;
             return result;
         }
diff --git a/generator/chu/UgcGenerator.cs b/generator/chu/UgcGenerator.cs
@@ -12,7 +12,6 @@ namespace MuConvert.chu;
 public class UgcGenerator : IGenerator<IChuChart>
 {
     private const int UgcTicksPerBeat = 480;
-    private const int C2sResolution = 384;
 
     public (string, List<Alert>) Generate(IChuChart chart)
     {
@@ -35,10 +34,8 @@ private static UgcChart ConvertToUgc(IChuChart chart, List<Alert> alerts)
                 Difficulty = c2s.Difficulty,
                 MusicId = c2s.MusicId,
             };
-            foreach (var b in c2s.BpmEvents)
-                result.BpmEvents.Add((b.Measure, ScaleUp(b.Offset), b.Bpm));
-            foreach (var m in c2s.MetEvents)
-                result.BeatEvents.Add((m.Measure, m.Num, m.Denom));
+            result.BpmList.AddRange(c2s.BpmList);
+            result.MetList.AddRange(c2s.MetList);
             result.Notes = c2s.Notes;
             return result;
         }
@@ -47,8 +44,6 @@ private static UgcChart ConvertToUgc(IChuChart chart, List<Alert> alerts)
         throw new ConversionException(alerts);
     }
 
-    private static int ScaleUp(int v) => (int)((long)v * UgcTicksPerBeat / (C2sResolution / 4));
-
     private static string Serialize(UgcChart ugc)
     {
         ugc.Sort();
@@ -63,20 +58,28 @@ private static string Serialize(UgcChart ugc)
         sb.AppendLine($"@CONST\t{ugc.Level:F5}");
         sb.AppendLine($"@SONGID\t{ugc.MusicId}");
         sb.AppendLine($"@TICKS\t{ugc.TicksPerBeat}");
-        foreach (var b in ugc.BeatEvents) sb.AppendLine($"@BEAT\t{b.Measure}\t{b.Num}\t{b.Den}");
-        foreach (var b in ugc.BpmEvents) sb.AppendLine($"@BPM\t{b.Measure}'{b.Offset}\t{b.Bpm:F5}");
+        var tpm = ugc.TicksPerBeat * 4;
+        foreach (var met in ugc.MetList)
+        {
+            var (m, _) = Utils.BarAndTick(met.Time, tpm);
+            sb.AppendLine($"@BEAT\t{m}\t{met.Numerator}\t{met.Denominator}");
+        }
+        foreach (var b in ugc.BpmList)
+        {
+            var (m, o) = Utils.BarAndTick(b.Time, tpm);
+            sb.AppendLine($"@BPM\t{m}'{o}\t{b.Bpm:F5}");
+        }
         sb.AppendLine("@TIL\t0\t0'0\t1.00000");
         sb.AppendLine("@MAINTIL\t0");
         sb.AppendLine("@ENDHEAD");
         sb.AppendLine();
 
-        var tpm = ugc.TicksPerBeat * 4;
         foreach (var n in ugc.Notes)
         {
-            var (m, o) = Utils.BarAndTick(n.Time, tpm, 0);
+            var (m, o) = Utils.BarAndTick(n.Time, tpm);
             sb.Append($"#{m}'{o}:{UCode(n, tpm)}");
             sb.AppendLine();
-            var durTicks = Utils.Tick(n.Duration, tpm, 0);
+            var durTicks = Utils.Tick(n.Duration, tpm);
             if (n.Type == "HLD" && durTicks > 0)
                 sb.AppendLine($"#{durTicks}>s");
             else if (n.Type == "SLD" && durTicks > 0)
@@ -88,7 +91,7 @@ private static string Serialize(UgcChart ugc)
     private static string UCode(ChuNote n, int tpm)
     {
         string c = Hx(n.Cell), w = Hw(n.Width);
-        var durTicks = Utils.Tick(n.Duration, tpm, 0);
+        var durTicks = Utils.Tick(n.Duration, tpm);
         var targetNote = string.IsNullOrEmpty(n.TargetNote) ? "N" : n.TargetNote;
         return n.Type switch
         {
diff --git a/parser/chu/C2sParser.cs b/parser/chu/C2sParser.cs
@@ -1,4 +1,5 @@
 using System.Globalization;
+using MuConvert.chart;
 using MuConvert.parser;
 using MuConvert.utils;
 using Rationals;
@@ -67,16 +68,20 @@ private static void ParseHeader(string[] p, C2sChart chart)
     private static void ParseTiming(string[] p, C2sChart chart)
     {
         var tag = p[0].ToUpperInvariant();
+        var tpm = chart.Resolution;
         switch (tag)
         {
             case "BPM":
-                chart.BpmEvents.Add((Int(p, 1), Int(p, 2), Dbl(p, 3, 120.0)));
+                chart.BpmList.Add(new BPM(Int(p, 1) + new Rational(Int(p, 2), tpm), decimal.Parse(p[3])));
                 break;
             case "MET":
-                chart.MetEvents.Add((Int(p, 1), Int(p, 2), Int(p, 3, 4), Int(p, 4, 4)));
+                chart.MetList.Add(new MET(Int(p, 1) + new Rational(Int(p, 2), tpm), Int(p, 4, 4), Int(p, 3, 4)));
                 break;
             case "SFL":
-                chart.SflEvents.Add((Int(p, 1), Int(p, 2), Int(p, 3), Dbl(p, 4, 1.0)));
+                chart.SflList.Add((
+                    Int(p, 1) + new Rational(Int(p, 2), tpm),
+                    new Rational(Int(p, 3), tpm),
+                    decimal.Parse(p[4])));
                 break;
         }
     }
@@ -144,6 +149,5 @@ private static void ParseNote(string[] p, C2sChart chart, List<Alert> alerts, in
     }
 
     private static int Int(string[] p, int i, int def = 0) => i < p.Length && int.TryParse(p[i], NumberStyles.Integer, CultureInfo.InvariantCulture, out var v) ? v : def;
-    private static double Dbl(string[] p, int i, double def = 0) => i < p.Length && double.TryParse(p[i], NumberStyles.Float, CultureInfo.InvariantCulture, out var v) ? v : def;
     private static string Str(string[] p, int i) => i < p.Length ? p[i] : "";
 }
diff --git a/parser/chu/SusParser.cs b/parser/chu/SusParser.cs
@@ -1,4 +1,5 @@
 using System.Globalization;
+using MuConvert.chart;
 using MuConvert.parser;
 using MuConvert.utils;
 using Rationals;
@@ -84,7 +85,7 @@ private static void ParseHeaderLine(string content, SusChart chart, List<Alert>
         {
             var bpmStr = content[8..].Trim().Trim('"');
             if (double.TryParse(bpmStr, NumberStyles.Float, CultureInfo.InvariantCulture, out var bpm))
-                chart.BpmEvents.Add((0, 0, bpm));
+                chart.BpmList.Add(new BPM(0, (decimal)bpm));
             else
                 alerts.Add(new Alert(Warning, $"BPM_DEF 格式错误: {content}") { Line = lineNum });
         }
diff --git a/parser/chu/UgcParser.cs b/parser/chu/UgcParser.cs
@@ -1,4 +1,5 @@
 using System.Globalization;
+using MuConvert.chart;
 using MuConvert.parser;
 using MuConvert.utils;
 using Rationals;
@@ -138,7 +139,7 @@ private static void ParseHeaderLine(string line, UgcChart chart, List<Alert> ale
                     && int.TryParse(beatParts[1], NumberStyles.Integer, CultureInfo.InvariantCulture, out var beatNum)
                     && int.TryParse(beatParts[2], NumberStyles.Integer, CultureInfo.InvariantCulture, out var beatDen))
                 {
-                    chart.BeatEvents.Add((beatMeasure, beatNum, beatDen));
+                    chart.MetList.Add(new MET(beatMeasure, beatNum, beatDen));
                 }
                 else
                 {
@@ -157,9 +158,10 @@ private static void ParseHeaderLine(string line, UgcChart chart, List<Alert> ale
                     if (apostropheIdx > 0
                         && int.TryParse(measureOffset[..apostropheIdx], NumberStyles.Integer, CultureInfo.InvariantCulture, out var bpmMeasure)
                         && int.TryParse(measureOffset[(apostropheIdx + 1)..], NumberStyles.Integer, CultureInfo.InvariantCulture, out var bpmOffset)
-                        && double.TryParse(bpmValueStr, NumberStyles.Float, CultureInfo.InvariantCulture, out var bpmValue))
+                        && decimal.TryParse(bpmValueStr, NumberStyles.Float, CultureInfo.InvariantCulture, out var bpmValue))
                     {
-                        chart.BpmEvents.Add((bpmMeasure, bpmOffset, bpmValue));
+                        var tpm = chart.TicksPerBeat * 4;
+                        chart.BpmList.Add(new BPM(bpmMeasure + new Rational(bpmOffset, tpm), bpmValue));
                     }
                     else
                     {
@@ -176,15 +178,15 @@ private static void ParseHeaderLine(string line, UgcChart chart, List<Alert> ale
             case "@VER": case "@EXVER": case "@SORT": case "@BGM": case "@BGMOFS": case "@BGMPRV":
             case "@JACKET": case "@BGIMG": case "@BGMODE": case "@FLDCOL": case "@FLDIMG":
             case "@FLAG": case "@ATINFO": case "@DLURL": case "@COPYRIGHT": case "@LICENSE":
-            case "@MAINTIL":
+            case "@MAINTIL": case "@TIL":
                 break;
 
-            case "@TIL": case "@SPDMOD":
+            case "@SPDMOD":
                 {
                     var parts = value.Split(['\t', ' '], StringSplitOptions.RemoveEmptyEntries);
                     if (parts.Length >= 2 && int.TryParse(parts[0], NumberStyles.Integer, CultureInfo.InvariantCulture, out var tilMeasure)
                         && double.TryParse(parts[1], NumberStyles.Float, CultureInfo.InvariantCulture, out var tilMult))
-                        chart.SpeedEvents.Add((tilMeasure, 0, tilMult));
+                        chart.SflList.Add((tilMeasure, Rational.Zero, (decimal)tilMult));
                 }
                 break;
 
diff --git a/tests/chu/ChuTests.cs b/tests/chu/ChuTests.cs

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,4 @@ public class SusChart : BaseChart<ChuNote>, IChuChart`
`11`	`11`	`public string Artist { get; set; } = "";`
`12`	`12`	`public string Designer { get; set; } = "";`
`13`	`13`	`public int TicksPerBeat { get; set; } = 480;`
`14`		`- public List<(int Measure, int Offset, double Bpm)> BpmEvents = [];`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Text;`
	`2`	`+using MuConvert.chart;`
`2`	`3`	`using MuConvert.generator;`
`3`	`4`	`using MuConvert.utils;`
`4`	`5`	`using static MuConvert.utils.Alert.LEVEL;`
`@@ -30,16 +31,18 @@ private static SusChart ConvertToSus(IChuChart chart, List<Alert> alerts)`
`30`	`31`
`31`	`32`	`if (chart is C2sChart c2s)`
`32`	`33`	`{`
`33`		`- bpm = c2s.BpmEvents[0].Bpm;`
	`34`	`+ bpm = c2s.BpmList.Count > 0 ? (double)c2s.BpmList[0].Bpm : 120.0;`
`34`	`35`	`var result = new SusChart { TicksPerBeat = SusTpb, Title = title, Artist = artist };`
	`36`	`+ result.BpmList.Add(new BPM(0, (decimal)bpm));`
`35`	`37`	`result.Notes = c2s.Notes;`
`36`	`38`	`return result;`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`if (chart is UgcChart ugc)`
`40`	`42`	`{`
`41`		`- bpm = ugc.BpmEvents.Count > 0 ? ugc.BpmEvents[0].Bpm : 120.0;`
	`43`	`+ bpm = ugc.BpmList.Count > 0 ? (double)ugc.BpmList[0].Bpm : 120.0;`
`42`	`44`	`var result = new SusChart { TicksPerBeat = SusTpb, Title = ugc.Title, Artist = ugc.Artist };`
	`45`	`+ result.BpmList.Add(new BPM(0, (decimal)bpm));`
`43`	`46`	`result.Notes = ugc.Notes;`
`44`	`47`	`return result;`
`45`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Globalization;`
	`2`	`+using MuConvert.chart;`
`2`	`3`	`using MuConvert.parser;`
`3`	`4`	`using MuConvert.utils;`
`4`	`5`	`using Rationals;`
`@@ -67,16 +68,20 @@ private static void ParseHeader(string[] p, C2sChart chart)`
`67`	`68`	`private static void ParseTiming(string[] p, C2sChart chart)`
`68`	`69`	`{`
`69`	`70`	`var tag = p[0].ToUpperInvariant();`
	`71`	`+ var tpm = chart.Resolution;`
`70`	`72`	`switch (tag)`
`71`	`73`	`{`
`72`	`74`	`case "BPM":`
`73`		`- chart.BpmEvents.Add((Int(p, 1), Int(p, 2), Dbl(p, 3, 120.0)));`
	`75`	`+ chart.BpmList.Add(new BPM(Int(p, 1) + new Rational(Int(p, 2), tpm), decimal.Parse(p[3])));`
`74`	`76`	`break;`
`75`	`77`	`case "MET":`
`76`		`- chart.MetEvents.Add((Int(p, 1), Int(p, 2), Int(p, 3, 4), Int(p, 4, 4)));`
	`78`	`+ chart.MetList.Add(new MET(Int(p, 1) + new Rational(Int(p, 2), tpm), Int(p, 4, 4), Int(p, 3, 4)));`
`77`	`79`	`break;`
`78`	`80`	`case "SFL":`
`79`		`- chart.SflEvents.Add((Int(p, 1), Int(p, 2), Int(p, 3), Dbl(p, 4, 1.0)));`
	`81`	`+ chart.SflList.Add((`
	`82`	`+ Int(p, 1) + new Rational(Int(p, 2), tpm),`
	`83`	`+ new Rational(Int(p, 3), tpm),`
	`84`	`+ decimal.Parse(p[4])));`
`80`	`85`	`break;`
`81`	`86`	`}`
`82`	`87`	`}`
`@@ -144,6 +149,5 @@ private static void ParseNote(string[] p, C2sChart chart, List<Alert> alerts, in`
`144`	`149`	`}`
`145`	`150`
`146`	`151`	`private static int Int(string[] p, int i, int def = 0) => i < p.Length && int.TryParse(p[i], NumberStyles.Integer, CultureInfo.InvariantCulture, out var v) ? v : def;`
`147`		`- private static double Dbl(string[] p, int i, double def = 0) => i < p.Length && double.TryParse(p[i], NumberStyles.Float, CultureInfo.InvariantCulture, out var v) ? v : def;`
`148`	`152`	`private static string Str(string[] p, int i) => i < p.Length ? p[i] : "";`
`149`	`153`	`}`