This commit is contained in:
CroakFang
2022-09-28 21:22:15 +08:00
parent ff8c44ba0d
commit 08e5106209
2 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -110,7 +110,7 @@ public class UmaContainer : MonoBehaviour
UmaAnimator = gameObject.AddComponent<Animator>();
UmaAnimator.avatar = AvatarBuilder.BuildGenericAvatar(gameObject, gameObject.name);
UmaAnimator.runtimeAnimatorController = OverrideController = Instantiate(UmaViewerBuilder.Instance.OverrideController);
}
public Transform[] MergeBone(SkinnedMeshRenderer from, List<Transform> targetBones)
+4 -3
View File
@@ -173,6 +173,9 @@ public class UmaViewerBuilder : MonoBehaviour
int head_id;
string head_costumeId;
int tailId = (int)charaData["tailModelId"];
if (id == 9006) tailId = -1;//The tailId of 9006 is 1, but the character has no tail
if (UI.isHeadFix && CurrentHead != null)
{
head_id = CurrentHead.id;
@@ -229,9 +232,7 @@ public class UmaViewerBuilder : MonoBehaviour
}
}
if (tailId != 0)
{
string tailName = $"tail{tailId.ToString().PadLeft(4, '0')}_00";
@@ -617,7 +618,7 @@ public class UmaViewerBuilder : MonoBehaviour
Type aType = asset.GetType();
if (aType == typeof(AnimationClip))
{
if (CurrentUMAContainer && CurrentUMAContainer.UmaAnimator)
if (CurrentUMAContainer && CurrentUMAContainer.UmaAnimator && CurrentUMAContainer.UmaAnimator.runtimeAnimatorController)
{
LoadAnimation(asset as AnimationClip);
}