diff --git a/Assets/Scripts/UI/UIPoseContainer.cs b/Assets/Scripts/UI/UIPoseContainer.cs index 700a80e..1f6fda1 100644 --- a/Assets/Scripts/UI/UIPoseContainer.cs +++ b/Assets/Scripts/UI/UIPoseContainer.cs @@ -53,7 +53,7 @@ public class UIPoseContainer : MonoBehaviour File.WriteAllText(fullpath, JsonConvert.SerializeObject(poseData)); - UmaViewerUI.Instance.ShowMessage($"Saved pose: {fullpath}", UIMessageType.Success); + //UmaViewerUI.Instance.ShowMessage($"Saved pose: {fullpath}", UIMessageType.Success); var poseContainers = UmaViewerUI.Instance.PoseManager.SavedPoseList.content.GetComponentsInChildren(); var poseContainer = poseContainers.FirstOrDefault(c => c.NameLabel.text == "AutoBackup"); diff --git a/Assets/Scripts/UmaContainerCharacter.cs b/Assets/Scripts/UmaContainerCharacter.cs index 0002adb..d64d850 100644 --- a/Assets/Scripts/UmaContainerCharacter.cs +++ b/Assets/Scripts/UmaContainerCharacter.cs @@ -782,6 +782,7 @@ public class UmaContainerCharacter : UmaContainer break; case "Gallop/3D/Chara/ToonMayu": m.shader = UmaAssetManager.EyebrowShader; + m.renderQueue += 1; //fix eyebrows disappearing sometimes break; default: Debug.Log(m.shader.name); @@ -1365,6 +1366,7 @@ public class UmaContainerCharacter : UmaContainer public void SetupBoneHandles() { + if (IsLive) return; UIHandleCharacterRoot rootHandle = UIHandleCharacterRoot.CreateAsChild(this); var humanBones = GetHumanBones(); @@ -1512,7 +1514,7 @@ public class UmaContainerCharacter : UmaContainer }; } - return _humanoidBones; + return _humanoidBones.Where(b => b != null).ToList(); } public List SaveMorphs(bool changedOnly) diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index bc4d0f5..3248590 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -46,8 +46,6 @@ public class UmaViewerBuilder : MonoBehaviour public IEnumerator LoadUma(CharaEntry chara, string costumeId, bool mini) { - PoseManager.SetPoseModeStatic(false); - int id = chara.Id; var umaContainer = new GameObject($"Chara_{id}_{costumeId}").AddComponent(); CurrentUMAContainer = umaContainer; @@ -526,6 +524,7 @@ public class UmaViewerBuilder : MonoBehaviour umaContainer.Initialize(!UI.isTPose); umaContainer.Position = umaContainer.transform.Find("Position"); + umaContainer.SetupBoneHandles(); if (!UI.isTPose && loadMotion) { @@ -638,7 +637,10 @@ public class UmaViewerBuilder : MonoBehaviour var eyebrowRmat = matList.FirstOrDefault(a => a.gameObject.name.Equals("M_Mayu_R")); UI.LoadFacialPanelsMini(eyemat.material, eyebrowLmat.material, eyebrowRmat.material, mouthmat.material); - if(Main.AbList.TryGetValue($"3d/motion/mini/event/body/chara/chr{id}_00/anm_min_eve_chr{id}_00_idle01_loop",out asset)) + umaContainer.Position = umaContainer.transform.Find("Position"); + umaContainer.SetupBoneHandles(); + + if (Main.AbList.TryGetValue($"3d/motion/mini/event/body/chara/chr{id}_00/anm_min_eve_chr{id}_00_idle01_loop",out asset)) { umaContainer.LoadAnimation(asset); } @@ -932,6 +934,8 @@ public class UmaViewerBuilder : MonoBehaviour public void UnloadUma() { + PoseManager.SetPoseModeStatic(false); + if (CurrentUMAContainer != null) { //It seems that OnDestroy will executed after new model loaded, which cause new FacialPanels empty... diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index c8fb313..1c60022 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -599,6 +599,7 @@ public class UmaViewerUI : MonoBehaviour public void PlayLive() { if (currentLive == null) return; + PoseManager.SetPoseMode(false); var selectlist = LiveSelectList.content.GetComponentsInChildren(); if (selectlist != null) { @@ -701,7 +702,6 @@ public class UmaViewerUI : MonoBehaviour list.Add(Main.AbList["3d/animator/drivenkeylocator"]); list.Add(Main.AbList[$"3d/motion/event/body/chara/chr{achara.Id}_00/anm_eve_chr{achara.Id}_00_idle01_loop"]); - Builder.UnloadUma(); //UmaAssetManager.UnloadAllBundle(true); UmaAssetManager.PreLoadAndRun(list , delegate {