Skip to content

Commit cd61fd7

Browse files
committed
fix: 修复 cubic 第2轮审查的 5 个问题
1. ALD/ASD 序列化字段顺序修正 (去掉多余的 Cell+Width) 2. EndTime 加 BPM>0 防 DivByZero 3. ko.resx 韩文翻译
1 parent e4619d1 commit cd61fd7

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

chart/chu/SusChart.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public class SusChart : BaseChart<ChuNote>, IChuChart
1515

1616
public override decimal StartBpm => (decimal)Bpm;
1717
public override decimal StartTime => Notes.Count > 0 ? Notes.Min(n => n.Measure * TicksPerBeat * 4 + n.Offset) / (decimal)(TicksPerBeat * 4) * 240m / StartBpm : 0;
18-
public override decimal EndTime => Notes.Count > 0 ? Notes.Max(n => n.Measure * TicksPerBeat * 4 + n.Offset + Math.Max(n.HoldDuration, Math.Max(n.SlideDuration, n.AirHoldDuration))) / (decimal)(TicksPerBeat * 4) * 240m / StartBpm : 0;
18+
public override decimal EndTime => Notes.Count > 0 && StartBpm > 0 ? Notes.Max(n => n.Measure * TicksPerBeat * 4 + n.Offset + Math.Max(n.HoldDuration, Math.Max(n.SlideDuration, n.AirHoldDuration))) / (decimal)(TicksPerBeat * 4) * 240m / StartBpm : 0;
1919
public override int TotalNotes => Notes.Count;
2020
}

chart/chu/UgcChart.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ public class UgcChart : BaseChart<ChuNote>, IChuChart
2222

2323
public override decimal StartBpm => (decimal)(BpmEvents.Count > 0 ? BpmEvents[0].Bpm : 120.0);
2424
public override decimal StartTime => Notes.Count > 0 ? Notes.Min(n => n.Measure * TicksPerBeat * 4 + n.Offset) / (decimal)(TicksPerBeat * 4) * 240m / StartBpm : 0;
25-
public override decimal EndTime => Notes.Count > 0 ? Notes.Max(n => n.Measure * TicksPerBeat * 4 + n.Offset + Math.Max(n.HoldDuration, Math.Max(n.SlideDuration, n.AirHoldDuration))) / (decimal)(TicksPerBeat * 4) * 240m / StartBpm : 0;
25+
public override decimal EndTime => Notes.Count > 0 && StartBpm > 0 ? Notes.Max(n => n.Measure * TicksPerBeat * 4 + n.Offset + Math.Max(n.HoldDuration, Math.Max(n.SlideDuration, n.AirHoldDuration))) / (decimal)(TicksPerBeat * 4) * 240m / StartBpm : 0;
2626
public override int TotalNotes => Notes.Count;
2727
}

generator/chu/C2sGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private static string Serialize(C2sChart chart)
115115
"FLK" => $"FLK\t{n.Measure}\t{n.Offset}\t{n.Cell}\t{n.Width}\t{n.Extra}",
116116
"AIR" or "AUR" or "AUL" or "ADW" or "ADR" or "ADL" => $"{n.Type}\t{n.Measure}\t{n.Offset}\t{n.Cell}\t{n.Width}\t{n.TargetNote}",
117117
"AHD" => $"AHD\t{n.Measure}\t{n.Offset}\t{n.Cell}\t{n.Width}\t{n.TargetNote}\t{n.AirHoldDuration}",
118-
"ALD" or "ASD" => $"{n.Type}\t{n.Measure}\t{n.Offset}\t{n.Cell}\t{n.Width}\t{n.StartHeight}\t{n.SlideDuration}\t{n.EndCell}\t{n.EndWidth}\t{n.TargetHeight}\t{n.NoteColor}",
118+
"ALD" or "ASD" => $"{n.Type}\t{n.Measure}\t{n.Offset}\t{n.StartHeight}\t{n.SlideDuration}\t{n.EndCell}\t{n.EndWidth}\t{n.TargetHeight}\t{n.NoteColor}",
119119
"MNE" => $"MNE\t{n.Measure}\t{n.Offset}\t{n.Cell}\t{n.Width}",
120120
_ => $"TAP\t{n.Measure}\t{n.Offset}\t{n.Cell}\t{n.Width}"
121121
};

i18n/Locale.ko.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@
272272
</data>
273273
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
274274
<data name="C2SUnknownNoteType" xml:space="preserve">
275-
<value>Unknown C2S note type: {0}</value>
275+
<value>알 수 없는 C2S 노트 타입: {0}</value>
276276
</data>
277277
<data name="ChuGeneratorUnsupported" xml:space="preserve">
278-
<value>Cannot convert chart to target format: {0}</value>
278+
<value>차트를 대상 형식으로 변환할 수 없습니다: {0}</value>
279279
</data>
280280
</root>

0 commit comments

Comments
 (0)