From e850c2f72d4774ce6e4dba550f8b30dd09081968 Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Sun, 29 Oct 2023 15:06:48 +0800 Subject: [PATCH] bug fix --- Assets/Scripts/Exporters/ModelExporter.cs | 26 ++++++++++++++--------- Assets/Scripts/UmaViewerUI.cs | 5 +++-- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/Assets/Scripts/Exporters/ModelExporter.cs b/Assets/Scripts/Exporters/ModelExporter.cs index 5a3be37..b3b1fdc 100644 --- a/Assets/Scripts/Exporters/ModelExporter.cs +++ b/Assets/Scripts/Exporters/ModelExporter.cs @@ -123,16 +123,22 @@ public class ModelExporter } }; - Mesh basefaceMesh = new Mesh(); - faceMesh.BakeMesh(basefaceMesh); - - Mesh baseEyeBrowMesh = new Mesh(); - eyebrowMesh.BakeMesh(baseEyeBrowMesh); - - addBlendShapePart(faceMesh, facial.EyeBrowMorphs, basefaceMesh); - addBlendShapePart(faceMesh, facial.EyeMorphs, basefaceMesh); - addBlendShapePart(faceMesh, facial.MouthMorphs, basefaceMesh); - addBlendShapePart(eyebrowMesh, facial.EyeBrowMorphs, baseEyeBrowMesh); + if (faceMesh) + { + Mesh basefaceMesh = new Mesh(); + faceMesh.BakeMesh(basefaceMesh); + addBlendShapePart(faceMesh, facial.EyeBrowMorphs, basefaceMesh); + addBlendShapePart(faceMesh, facial.EyeMorphs, basefaceMesh); + addBlendShapePart(faceMesh, facial.MouthMorphs, basefaceMesh); + } + + if (eyebrowMesh) + { + Mesh baseEyeBrowMesh = new Mesh(); + eyebrowMesh.BakeMesh(baseEyeBrowMesh); + addBlendShapePart(eyebrowMesh, facial.EyeBrowMorphs, baseEyeBrowMesh); + } + facial.ClearAllWeights(); facial.ChangeMorph(); } diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 9238192..1412c8a 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -745,9 +745,10 @@ public class UmaViewerUI : MonoBehaviour list.AddRange(Main.AbChara.Where(a => a.Name.StartsWith(UmaDatabaseController.HeadPath) && a.Name.Contains(chara.Id.ToString()))); list.AddRange(Main.AbChara.Where(a => a.Name.StartsWith("3d/chara/tail"))); list.Add(Main.AbList["3d/animator/drivenkeylocator"]); - if(!chara.IsMob && !isHeadFix) + var motion_path = $"3d/motion/event/body/chara/chr{chara.Id}_00/anm_eve_chr{chara.Id}_00_idle01_loop"; + if (!chara.IsMob && !isHeadFix && Main.AbList.TryGetValue(motion_path, out var motion_entry)) { - list.Add(Main.AbList[$"3d/motion/event/body/chara/chr{chara.Id}_00/anm_eve_chr{chara.Id}_00_idle01_loop"]); + list.Add(motion_entry); } Builder.UnloadUma();