Added morph clear button

removed redundant property
This commit is contained in:
katboi01
2022-11-01 19:00:40 +01:00
parent ae640a1b4b
commit 7c07615b8a
8 changed files with 347 additions and 72 deletions
+35 -35
View File
@@ -93,6 +93,40 @@ public class UmaViewerUI : MonoBehaviour
canvasScaler.screenMatchMode = CanvasScaler.ScreenMatchMode.Shrink;
}
private void Update()
{
if (Builder.CurrentAudioSources.Count > 0)
{
AudioSource MianSource = Builder.CurrentAudioSources[0];
if (MianSource.clip)
{
TitleText.text = MianSource.clip.name;
ProgressText.text = string.Format("{0} / {1}", ToTimeFormat(MianSource.time), ToTimeFormat(MianSource.clip.length));
AudioSlider.SetValueWithoutNotify(MianSource.time / MianSource.clip.length);
LyricsText.text = GetCurrentLyrics(MianSource.time);
}
}
if (Builder.CurrentUMAContainer != null && Builder.CurrentUMAContainer.OverrideController != null)
{
if (Builder.CurrentUMAContainer.OverrideController["clip_2"].name != "clip_2")
{
bool isLoop = Builder.CurrentUMAContainer.OverrideController["clip_2"].name.EndsWith("_loop");
var AnimeState = Builder.CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0);
var AnimeClip = Builder.CurrentUMAContainer.OverrideController["clip_2"];
if (AnimeClip && Builder.CurrentUMAContainer.UmaAnimator.speed != 0)
{
var normalizedTime = (isLoop) ? Mathf.Repeat(AnimeState.normalizedTime, 1) : Mathf.Min(AnimeState.normalizedTime, 1);
AnimationTitleText.text = AnimeClip.name;
AnimationProgressText.text = string.Format("{0} / {1}", ToFrameFormat(normalizedTime * AnimeClip.length, AnimeClip.frameRate), ToFrameFormat(AnimeClip.length, AnimeClip.frameRate));
AnimationSlider.SetValueWithoutNotify(normalizedTime);
}
}
}
}
public void HighlightChildImage(Transform mainObject, Image child)
{
foreach(var t in mainObject.GetComponentsInChildren<Image>())
@@ -184,7 +218,7 @@ public class UmaViewerUI : MonoBehaviour
{
var container = Instantiate(UmaContainerSliderPrefab, FacialList.content).GetComponent<UmaUIContainer>();
container.Name.text = morph.name + " (" + morph.tag + ")";
container.Slider.value = morph.Weight;
container.Slider.value = morph.weight;
container.Slider.maxValue = 1;
container.Slider.minValue = 0;
container.Slider.onValueChanged.AddListener((a) => { target.ChangeMorphWeight(morph, a); });
@@ -647,40 +681,6 @@ public class UmaViewerUI : MonoBehaviour
Builder.CurrentUMAContainer.UmaAnimator.speed = val;
}
private void Update()
{
if (Builder.CurrentAudioSources.Count > 0)
{
AudioSource MianSource = Builder.CurrentAudioSources[0];
if (MianSource.clip)
{
TitleText.text = MianSource.clip.name;
ProgressText.text = string.Format("{0} / {1}", ToTimeFormat(MianSource.time), ToTimeFormat(MianSource.clip.length));
AudioSlider.SetValueWithoutNotify(MianSource.time/ MianSource.clip.length);
LyricsText.text = GetCurrentLyrics(MianSource.time);
}
}
if (Builder.CurrentUMAContainer != null && Builder.CurrentUMAContainer.OverrideController != null)
{
if(Builder.CurrentUMAContainer.OverrideController["clip_2"].name != "clip_2")
{
bool isLoop = Builder.CurrentUMAContainer.OverrideController["clip_2"].name.EndsWith("_loop");
var AnimeState = Builder.CurrentUMAContainer.UmaAnimator.GetCurrentAnimatorStateInfo(0);
var AnimeClip = Builder.CurrentUMAContainer.OverrideController["clip_2"];
if (AnimeClip && Builder.CurrentUMAContainer.UmaAnimator.speed != 0)
{
var normalizedTime = (isLoop) ? Mathf.Repeat(AnimeState.normalizedTime, 1) : Mathf.Min(AnimeState.normalizedTime, 1);
AnimationTitleText.text = AnimeClip.name;
AnimationProgressText.text = string.Format("{0} / {1}", ToFrameFormat(normalizedTime * AnimeClip.length, AnimeClip.frameRate), ToFrameFormat(AnimeClip.length, AnimeClip.frameRate));
AnimationSlider.SetValueWithoutNotify(normalizedTime);
}
}
}
}
public void ResetAudioPlayer()
{
TitleText.text = "No Audio";