From f44b8695ffad94e5dcf2f20a93fa281eedd62400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E7=9C=8B?= <1918891542@qq.com> Date: Mon, 31 Oct 2022 18:12:12 +0800 Subject: [PATCH] Add morph name --- Assets/Scripts/UmaViewerUI.cs | 2 +- Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs | 5 +++++ Assets/Scripts/umamusume/Gallop/FacialMorph.cs | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 84efc86..846edf6 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -176,7 +176,7 @@ public class UmaViewerUI : MonoBehaviour foreach (FacialMorph morph in tempMorph) { var container = Instantiate(UmaContainerSliderPrefab, FacialList.content).GetComponent(); - container.Name.text = morph.name; + container.Name.text = morph.name + " (" + morph.tag + ")"; container.Slider.value = morph.Weight; container.Slider.maxValue = 1; container.Slider.minValue = 0; diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index 8ac3dcb..be9c558 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -2,6 +2,8 @@ using System.Collections; using System.Collections.Generic; using System.Text; using UnityEngine; +using Gallop.Live.Cutt; +using System; namespace Gallop { @@ -33,6 +35,7 @@ namespace Gallop morph.target = this; morph.direction = j > 0; morph.name = "EyeBrow_" + i + "_" + (morph.direction ? "L" : "R"); + morph.tag = Enum.GetName(typeof(LiveTimelineDefine.FacialEyebrowId), i); morph.trsArray = _eyebrowTarget[i]._faceGroupInfo[j]._trsArray; foreach (TrsArray trs in morph.trsArray) { @@ -58,6 +61,7 @@ namespace Gallop morph.target = this; morph.direction = j > 0; morph.name = "Eye_" + i + "_" + (morph.direction ? "L" : "R"); + morph.tag = Enum.GetName(typeof(LiveTimelineDefine.FacialEyeId), i); morph.trsArray = _eyeTarget[i]._faceGroupInfo[j]._trsArray; foreach (TrsArray trs in morph.trsArray) { @@ -83,6 +87,7 @@ namespace Gallop morph.target = this; morph.direction = j > 0; morph.name = "Mouth_" + i + "_" + j; + morph.tag = Enum.GetName(typeof(LiveTimelineDefine.FacialMouthId), i); morph.trsArray = _mouthTarget[i]._faceGroupInfo[j]._trsArray; foreach (TrsArray trs in morph.trsArray) { diff --git a/Assets/Scripts/umamusume/Gallop/FacialMorph.cs b/Assets/Scripts/umamusume/Gallop/FacialMorph.cs index 614429c..c7a0dca 100644 --- a/Assets/Scripts/umamusume/Gallop/FacialMorph.cs +++ b/Assets/Scripts/umamusume/Gallop/FacialMorph.cs @@ -11,6 +11,7 @@ namespace Gallop public class FacialMorph { public string name; + public string tag = ""; public bool direction; public FaceDrivenKeyTarget target; private float _weight;