bug fix, add Animation continuous play

This commit is contained in:
CroakFang
2022-11-14 14:09:24 +08:00
parent 7e201baa89
commit e103b53480
7 changed files with 107 additions and 46 deletions
+35 -2
View File
@@ -1,6 +1,7 @@
using Gallop;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using UnityEngine;
public class UmaContainer : MonoBehaviour
@@ -18,6 +19,7 @@ public class UmaContainer : MonoBehaviour
public AnimatorOverrideController OverrideController;
public Animator UmaFaceAnimator;
public AnimatorOverrideController FaceOverrideController;
public bool isAnimatorControl;
[Header("Face")]
@@ -28,6 +30,11 @@ public class UmaContainer : MonoBehaviour
public float EyeHeight;
public bool EnableEyeTracking = true;
[Header("Body")]
public GameObject UpBodyBone;
public Vector3 UpBodyPosition;
public Quaternion UpBodyRotation;
[Header("Cheek")]
public Texture CheekTex;
public Material CheekMaterial;
@@ -48,11 +55,17 @@ public class UmaContainer : MonoBehaviour
[Header("Shader")]
public Material FaceMaterial;
public void Initialize()
{
EyeHeight = 0.1f;
TrackTarget = Camera.main.gameObject;
UpBodyPosition = UpBodyBone.transform.localPosition;
UpBodyRotation = UpBodyBone.transform.localRotation;
}
public void MergeModel()
{
if (!Body) return;
EyeHeight = 0.1f;
TrackTarget = Camera.main.gameObject;
List<Transform> bodybones = new List<Transform>(Body.GetComponentInChildren<SkinnedMeshRenderer>().bones);
List<Transform> emptyBones = new List<Transform>();
@@ -199,4 +212,24 @@ public class UmaContainer : MonoBehaviour
}
}
}
public void SetNextAnimationCut(string cutName)
{
var asset = UmaViewerMain.Instance.AbMotions.FirstOrDefault(a => a.Name.Equals(cutName));
UmaViewerBuilder.Instance.RecursiveLoadAsset(asset);
}
public void SetEndAnimationCut()
{
UmaViewerUI.Instance.AnimationPause();
}
public void UpBodyReset()
{
if (UpBodyBone)
{
UpBodyBone.transform.localPosition = UpBodyPosition;
UpBodyBone.transform.localRotation = UpBodyRotation;
}
}
}