h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 07:27:25 +08:00
Code Issues Releases Wiki Activity

Changed logic a bit

Browse Source
This commit is contained in:
EVAST9919 2017-05-08 19:14:19 +03:00
parent ae2186970c
commit 4b5e24cc36
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Play/SongProgress.cs
View File

@ -45,6 +45,7 @@ namespace osu.Game.Screens.Play
set
{
graph.Objects = objects = value;
info.SongLenght = lastHitTime - firstHitTime;
}
}
@ -146,8 +147,7 @@ namespace osu.Game.Screens.Play
graph.Progress = (int)(graph.ColumnCount * progress);
info.Progress = (int)(progress * 100);
info.TimeCurrent = currentTime;
info.TimeLeft = lastHitTime - firstHitTime - currentTime;
info.CurrentTime = currentTime;
}
}
}

28
osu.Game/Screens/Play/SongProgressInfo.cs
View File

@ -13,25 +13,26 @@ namespace osu.Game.Screens.Play
{
public class SongProgressInfo : Container
{
private OsuSpriteText timeCurrentText;
private OsuSpriteText timeCurrent;
private OsuSpriteText timeLeft;
private OsuSpriteText progressText;
private double currentTime;
private double songLenght;
private int progress;
private double timeCurrent;
private const int margin = 10;
public double TimeCurrent
public double SongLenght { set { songLenght = value; } }
public double CurrentTime
{
set
{
timeCurrent = value;
currentTime = value;
if (value > 0)
timeCurrentText.Text = TimeSpan.FromMilliseconds(value).ToString(@"m\:ss");
timeCurrent.Text = TimeSpan.FromMilliseconds(value).ToString(@"m\:ss");
}
}
public double TimeLeft { set { timeLeft.Text = @"-" + TimeSpan.FromMilliseconds(timeCurrent < 0 ? value + timeCurrent : value).ToString(@"m\:ss"); } }
public int Progress
{
set
@ -40,7 +41,7 @@ namespace osu.Game.Screens.Play
return;
progress = value;
if (value > 0)
if (currentTime > 0)
progressText.Text = value.ToString() + @"%";
}
}
@ -50,7 +51,7 @@ namespace osu.Game.Screens.Play
{
Children = new Drawable[]
{
timeCurrentText = new OsuSpriteText
timeCurrent = new OsuSpriteText
{
Origin = Anchor.BottomLeft,
Anchor = Anchor.BottomLeft,
@ -79,9 +80,18 @@ namespace osu.Game.Screens.Play
Margin = new MarginPadding
{
Right = margin,
}
},
Text = @"-" + TimeSpan.FromMilliseconds(songLenght).ToString(@"m\:ss"),
}
};
}
protected override void Update()
{
base.Update();
if(currentTime > 0)
timeLeft.Text = @"-" + TimeSpan.FromMilliseconds(songLenght - currentTime).ToString(@"m\:ss");
}
}
}