Animation progress text change to FrameCount format.

This commit is contained in:
gamer-jp
2022-09-29 01:21:16 +09:00
parent 33764b7688
commit a935d2aec1
+13 -3
View File
@@ -584,7 +584,7 @@ public class UmaViewerUI : MonoBehaviour
Builder.CurrentUMAContainer.UmaAnimator.speed = 0;
animator.Play(0, -1, val);
AnimationProgressText.text = string.Format("{0} / {1}", ToTimeFormat(val * AnimeClip.length), ToTimeFormat(AnimeClip.length));
AnimationProgressText.text = string.Format("{0} / {1}", ToFrameFormat(val * AnimeClip.length, AnimeClip.frameRate), ToFrameFormat(AnimeClip.length, AnimeClip.frameRate));
}
}
@@ -619,8 +619,9 @@ public class UmaViewerUI : MonoBehaviour
if (AnimeClip && Builder.CurrentUMAContainer.UmaAnimator.speed != 0)
{
AnimationTitleText.text = AnimeClip.name;
AnimationProgressText.text = string.Format("{0} / {1}", ToTimeFormat(AnimeState.normalizedTime * AnimeClip.length), ToTimeFormat(AnimeClip.length));
AnimationSlider.SetValueWithoutNotify(AnimeState.normalizedTime);
var normalizedTime = (AnimeState.normalizedTime < 1.0f) ? AnimeState.normalizedTime : 1.0f;
AnimationProgressText.text = string.Format("{0} / {1}", ToFrameFormat(normalizedTime * AnimeClip.length, AnimeClip.frameRate), ToFrameFormat(AnimeClip.length, AnimeClip.frameRate));
AnimationSlider.SetValueWithoutNotify(normalizedTime);
}
}
}
@@ -643,6 +644,15 @@ public class UmaViewerUI : MonoBehaviour
return string.Format("{0:D2}:{1:D2}:{2:D2}", hour, minute, seconds);
}
public static string ToFrameFormat(float time, float frameRate)
{
int frames = Mathf.FloorToInt(time % 1 * frameRate);
int seconds = (int)time;
int minute = seconds % 3600 / 60;
seconds = seconds % 3600 % 60;
return string.Format("{0:D2}m:{1:D2}s:{2:D2}f", minute, seconds, frames);
}
public string GetCurrentLyrics(float time)
{
for(int i = Builder.CurrentLyrics.Count-1; i >=0; i--)