From 698e689c3b92f50d377ef1e8f2324853d2633a6a Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Fri, 7 Apr 2023 23:18:53 +0800 Subject: [PATCH] add basic ear animation --- Assets/Scripts/UmaViewerBuilder.cs | 5 ++++ Assets/Scripts/UmaViewerUI.cs | 41 ++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 7e60cba..4fa7525 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -1687,6 +1687,11 @@ public class UmaViewerBuilder : MonoBehaviour } else { + if (CurrentUMAContainer.FaceOverrideController["clip_2"].name == "clip_2") + { + CurrentUMAContainer.isAnimatorControl = true; + CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); + } CurrentUMAContainer.FaceOverrideController["clip_2_ear"] = clip; CurrentUMAContainer.UmaFaceAnimator.Play("motion_2", 1, 0); } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 102b79f..2eb6931 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -217,22 +217,30 @@ public class UmaViewerUI : MonoBehaviour public void LoadModelPanels() { - var container1 = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent(); - container1.Name = container1.name = "Generic"; - container1.Button.onClick.AddListener(() => + var containerG = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent(); + containerG.Name = containerG.name = "Generic"; + containerG.Button.onClick.AddListener(() => { - HighlightChildImage(AnimationSetList.content, container1); + HighlightChildImage(AnimationSetList.content, containerG); ListAnimations(-1, false); }); - var container2 = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent(); - container2.Name = container2.name = "Tail"; - container2.Button.onClick.AddListener(() => + var containerT = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent(); + containerT.Name = containerT.name = "Tail"; + containerT.Button.onClick.AddListener(() => { - HighlightChildImage(AnimationSetList.content, container2); + HighlightChildImage(AnimationSetList.content, containerT); ListAnimations(-2, false); }); + var containerE = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent(); + containerE.Name = containerE.name = "Ear"; + containerE.Button.onClick.AddListener(() => + { + HighlightChildImage(AnimationSetList.content, containerE); + ListAnimations(-3, false); + }); + foreach (var chara in Main.Characters.OrderBy(c => c.Id)) { var charaInstance = chara; @@ -794,6 +802,23 @@ public class UmaViewerUI : MonoBehaviour } pageManager.ResetCtrl(); } + else if (umaId == -3) + { + foreach (var entry in Main.AbMotions.Where(a => a.Name.Contains($"type00_ear")&&!a.Name.EndsWith("driven") && !a.Name.Contains("touch"))) + { + var entryInstance = entry; + var container = Instantiate(UmaContainerPrefab, animationList.content).GetComponent(); + container.Name = container.name = Path.GetFileName(entry.Name); + container.FontSize = 20; + container.Button.onClick.AddListener(() => + { + HighlightChildImage(animationList.content, container); + Builder.LoadAsset(entryInstance); + LoadedAnimation(); + }); + } + pageManager.ResetCtrl(); + } else { //Common animations