diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 1feaca7..06c4cd0 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -159,13 +159,21 @@ public class UmaViewerUI : MonoBehaviour public void LoadModelPanels() { var container = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent(); - container.Name.text = container.name = "type00"; + container.Name.text = container.name = "General"; var imageInstance = container.GetComponent(); container.Button.onClick.AddListener(() => { HighlightChildImage(AnimationSetList.content, imageInstance); ListAnimations(-1, false); }); + container = Instantiate(UmaContainerPrefab, AnimationSetList.content).GetComponent(); + container.Name.text = container.name = "Tail"; + imageInstance = container.GetComponent(); + container.Button.onClick.AddListener(() => { + HighlightChildImage(AnimationSetList.content, imageInstance); + ListAnimations(-2, false); + }); + foreach (var chara in Main.Characters.OrderBy(c => c.Id)) { var charaInstance = chara; @@ -280,7 +288,7 @@ public class UmaViewerUI : MonoBehaviour public void LoadMiniModelPanels() { var container = Instantiate(UmaContainerPrefab, MiniAnimationSetList.content).GetComponent(); - container.Name.text = container.name = "type00"; + container.Name.text = container.name = "General"; var imageInstance = container.GetComponent(); container.Button.onClick.AddListener(() => { HighlightChildImage(MiniAnimationSetList.content, imageInstance); @@ -495,7 +503,21 @@ public class UmaViewerUI : MonoBehaviour if (umaId == -1) { - foreach (var entry in filteredList.Where(a=> a.Name.Contains($"/type00"))) + foreach (var entry in filteredList.Where(a=> a.Name.Contains($"/type00") && !a.Name.Contains($"/tail"))) + { + var entryInstance = entry; + var container = Instantiate(UmaContainerPrefab, animationList.content).GetComponent(); + container.Name.text = container.name = Path.GetFileName(entry.Name); + container.Button.onClick.AddListener(() => { + HighlightChildImage(animationList.content, container.GetComponent()); + Builder.LoadAsset(entryInstance); + LoadedAnimation(); + }); + } + } + else if(umaId == -2) + { + foreach (var entry in filteredList.Where(a => a.Name.Contains($"/tail"))) { var entryInstance = entry; var container = Instantiate(UmaContainerPrefab, animationList.content).GetComponent(); diff --git a/Assets/Scripts/umamusume/Gallop/DrivenKeyAnimation.cs b/Assets/Scripts/umamusume/Gallop/DrivenKeyAnimation.cs new file mode 100644 index 0000000..4472062 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/DrivenKeyAnimation.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Gallop +{ + [System.Serializable] + public class FaceTypeSet // TypeDefIndex: 24416 + { + public int[] faceType; // 0x10 + public int count; // 0x18 + } + + [System.Serializable] + public class EarTypeSet // TypeDefIndex: 24417 + { + public EarType[] faceType; // 0x10 + public int count; // 0x18 + } + + [System.Serializable] + public class DrivenKeyAnimation : ScriptableObject + { + public const int FaceNumGroupDiff = 2; + public const int FaceNum = 5; + public const int EyeNum = 2; + public const int EyebrowNum = 2; + public const int MouthNum = 1; + public const int EarNum = 2; + public AnimationClip clip; // 0x18 + public FaceTypeSet[] animationFaceType; // 0x20 + public EarTypeSet[] animationEarType; // 0x28 + [SerializeField] // RVA: 0x1EC0 Offset: 0x1EC0 VA: 0x7FFD44411EC0 + private bool _isCheckEyeRange; // 0x30 + } +} diff --git a/Assets/Scripts/umamusume/Gallop/DrivenKeyAnimation.cs.meta b/Assets/Scripts/umamusume/Gallop/DrivenKeyAnimation.cs.meta new file mode 100644 index 0000000..6eedb10 --- /dev/null +++ b/Assets/Scripts/umamusume/Gallop/DrivenKeyAnimation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a19ef0ecc49491341b059327ecf2293b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: