|
@@ -60,7 +60,7 @@ internal class MainForm : BaseForm
|
|
|
//public int CurrentMaxScore { get; set; }
|
|
|
public double CurrentAcc { get; set; } = 0.0;
|
|
|
|
|
|
- public int CurrentNotePerSecond { get; set; }
|
|
|
+ public int CurrentCutPerSecond { get; set; }
|
|
|
public int CurrentMissed { get; set; }
|
|
|
|
|
|
public float? CpuUsage { get; set; } = 12.3f;
|
|
@@ -234,14 +234,14 @@ internal class MainForm : BaseForm
|
|
|
{
|
|
|
var now = DateTime.Now;
|
|
|
var preNow = now.AddSeconds(-1);
|
|
|
- CurrentNotePerSecond = CutHistory.Count(p => p.Time > preNow);
|
|
|
+ CurrentCutPerSecond = CutHistory.Count(p => p.Time > preNow);
|
|
|
CutHistory.Add(new HistoryModel
|
|
|
{
|
|
|
Time = now,
|
|
|
CutScore = e.NoteCut.FinalScore.Value,
|
|
|
CurrentCombo = CurrentCombo,
|
|
|
//Percent = CurrentMaxScore == 0 ? 0 : ((float)CurrentScore / CurrentMaxScore),
|
|
|
- CutsPerSecond = CurrentNotePerSecond,
|
|
|
+ CutsPerSecond = CurrentCutPerSecond,
|
|
|
HeartRate = YurStatus.HeartRate,
|
|
|
KcalPerMin = YurStatus.KcalPerMin,
|
|
|
});
|
|
@@ -278,7 +278,7 @@ internal class MainForm : BaseForm
|
|
|
{
|
|
|
var now = DateTime.Now;
|
|
|
var preNow = now.AddSeconds(-1);
|
|
|
- CurrentNotePerSecond = CutHistory.Count(p => p.Time > preNow);
|
|
|
+ CurrentCutPerSecond = CutHistory.Count(p => p.Time > preNow);
|
|
|
|
|
|
CutHistory.Add(new HistoryModel
|
|
|
{
|
|
@@ -286,7 +286,7 @@ internal class MainForm : BaseForm
|
|
|
CutScore = e.LiveData.BlockHitScore.Total,
|
|
|
CurrentCombo = CurrentCombo,
|
|
|
Acc = (float)CurrentAcc,
|
|
|
- CutsPerSecond = CurrentNotePerSecond,
|
|
|
+ CutsPerSecond = CurrentCutPerSecond,
|
|
|
HeartRate = YurStatus.HeartRate,
|
|
|
KcalPerMin = YurStatus.KcalPerMin,
|
|
|
});
|
|
@@ -537,10 +537,10 @@ internal class MainForm : BaseForm
|
|
|
Brushes.Green, 2.5f);
|
|
|
x += sz.Width + margin * 2;
|
|
|
|
|
|
- sz = g.DrawStringWithOutline($"{CurrentNotePerSecond}", Font, x, y, Color.Black, Color.White);
|
|
|
+ sz = g.DrawStringWithOutline($"{CurrentCutPerSecond}", Font, x, y, Color.Black, Color.White);
|
|
|
x += sz.Width + margin * 2;
|
|
|
|
|
|
- sz = g.DrawStringWithRoundedRect("NOTE / SEC", _smallFont, x, y + margin * 1.5f, Brushes.Black,
|
|
|
+ sz = g.DrawStringWithRoundedRect("CUT / SEC", _smallFont, x, y + margin * 1.5f, Brushes.Black,
|
|
|
Brushes.Yellow, 2.5f);
|
|
|
x += sz.Width + margin * 2;
|
|
|
|