From 7369af2d5b5e8debb95d6e41f184282d27821374 Mon Sep 17 00:00:00 2001 From: Katboi01 Date: Sun, 20 Aug 2023 12:04:11 +0200 Subject: [PATCH] Asset loading rework Asset unloading not final! --- Assets/Scripts/UmaAssetManager.cs | 48 + Assets/Scripts/UmaContainer.cs | 14 +- Assets/Scripts/UmaContainerCharacter.cs | 797 ++++++++++++ Assets/Scripts/UmaContainerCharacter.cs.meta | 11 + Assets/Scripts/UmaContainerProp.cs | 25 + Assets/Scripts/UmaContainerProp.cs.meta | 11 + Assets/Scripts/UmaDatabase/UmaDataTypes.cs | 34 - .../Scripts/UmaDatabase/UmaDatabaseEntry.cs | 66 + .../UmaDatabase/UmaDatabaseEntry.cs.meta | 11 + Assets/Scripts/UmaViewerBuilder.cs | 1094 ++--------------- Assets/Scripts/UmaViewerUI.cs | 59 +- 11 files changed, 1101 insertions(+), 1069 deletions(-) create mode 100644 Assets/Scripts/UmaContainerCharacter.cs create mode 100644 Assets/Scripts/UmaContainerCharacter.cs.meta create mode 100644 Assets/Scripts/UmaContainerProp.cs create mode 100644 Assets/Scripts/UmaContainerProp.cs.meta create mode 100644 Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs create mode 100644 Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs.meta diff --git a/Assets/Scripts/UmaAssetManager.cs b/Assets/Scripts/UmaAssetManager.cs index 373842e..aeabeae 100644 --- a/Assets/Scripts/UmaAssetManager.cs +++ b/Assets/Scripts/UmaAssetManager.cs @@ -94,6 +94,7 @@ public class UmaAssetManager : MonoBehaviour Debug.Log(filePath + " exists and doesn't work"); UmaViewerUI.Instance?.ShowMessage(filePath + " exists and doesn't work", UIMessageType.Error); } + LoadEntryData(entry, bundle); AddOrUpdate(entry.Name, bundle, neverUnload); if (!neverUnload) { @@ -154,6 +155,18 @@ public class UmaAssetManager : MonoBehaviour public static bool Exist(AssetBundle bundle) => instance.LoadedBundles.ContainsValue(bundle); + public static void UnloadBundle(UmaDatabaseEntry entry, bool unloadAllObjects) + { + if (instance.NeverUnload.ContainsValue(entry.LoadedBundle)) return; + var abEntry = instance.LoadedBundles.FirstOrDefault(b => b.Value == entry.LoadedBundle); + if (abEntry.Key != null) + { + instance.LoadedBundles.Remove(abEntry.Key); + } + UnloadEntryData(entry, abEntry.Value); + entry.Unload(unloadAllObjects); + } + private static void UnloadBundle(AssetBundle bundle, bool unloadAllObjects) { if(instance.NeverUnload.ContainsValue(bundle)) return; @@ -194,5 +207,40 @@ public class UmaAssetManager : MonoBehaviour } OnLoadedBundleClear?.Invoke(); } + + private static void LoadEntryData(UmaDatabaseEntry entry, AssetBundle bundle) + { + entry.LoadedBundle = bundle; + if (bundle.name == "shader.a") + { + var builder = UmaViewerBuilder.Instance; + builder.hairShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonhairtser.shader"); + builder.faceShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonfacetser.shader"); + builder.eyeShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertooneyet.shader"); + builder.cheekShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactermultiplycheek.shader"); + builder.eyebrowShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonmayu.shader"); + builder.alphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoonhairtser.shader"); + builder.bodyAlphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoontser.shader"); + builder.bodyBehindAlphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoonbehindtser.shader"); + } + + foreach (var name in bundle.GetAllAssetNames()) + { + var asset = bundle.LoadAsset(name); + if (asset != null) + { + entry.Assets.Add(asset); + entry.AssetNames[asset] = name; + } + } + } + + private static void UnloadEntryData(UmaDatabaseEntry entry, AssetBundle bundle) + { + entry.LoadedBundle = null; + entry.Assets.Clear(); + entry.AssetNames.Clear(); + } + } diff --git a/Assets/Scripts/UmaContainer.cs b/Assets/Scripts/UmaContainer.cs index c6af723..b1c5373 100644 --- a/Assets/Scripts/UmaContainer.cs +++ b/Assets/Scripts/UmaContainer.cs @@ -89,6 +89,9 @@ public class UmaContainer : MonoBehaviour public CharaShaderEffectData ShaderEffectData; public List Materials = new List(); + protected UmaViewerBuilder Builder => UmaViewerBuilder.Instance; + protected UmaViewerMain Main => UmaViewerMain.Instance; + protected UmaViewerUI UI => UmaViewerUI.Instance; public void Initialize(bool smile) { @@ -400,17 +403,6 @@ public class UmaContainer : MonoBehaviour } } - public void SetNextAnimationCut(string cutName) - { - UmaViewerMain.Instance.AbList.TryGetValue(cutName, out UmaDatabaseEntry asset); - UmaViewerBuilder.Instance.RecursiveLoadAsset(asset); - } - - public void SetEndAnimationCut() - { - UmaViewerUI.Instance.AnimationPause(); - } - public void UpBodyReset() { if (UpBodyBone) diff --git a/Assets/Scripts/UmaContainerCharacter.cs b/Assets/Scripts/UmaContainerCharacter.cs new file mode 100644 index 0000000..ad7a71c --- /dev/null +++ b/Assets/Scripts/UmaContainerCharacter.cs @@ -0,0 +1,797 @@ +using Gallop; +using Gallop.Live.Cutt; +using RootMotion.Dynamics; +using RootMotion.FinalIK; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.IO; +using System.Linq; +using UnityEngine; +using Random = UnityEngine.Random; + +public class UmaContainerCharacter : UmaContainer +{ + public void LoadTextures(UmaDatabaseEntry entry) + { + entry.Load(); + foreach(Texture2D tex2D in entry.Assets) + { + if (entry.Name.Contains("/mini/head")) + { + MiniHeadTextures.Add(tex2D); + } + else if (entry.Name.Contains("/tail/")) + { + TailTextures.Add(tex2D); + } + else if (entry.Name.Contains("bdy0")) + { + GenericBodyTextures.Add(tex2D); + } + else if (entry.Name.Contains("_face") || entry.Name.Contains("_hair")) + { + if (IsMob) + MobHeadTextures.Add(tex2D); + } + } + } + + public void LoadBody(UmaDatabaseEntry entry) + { + GameObject go = entry.Load().Get(); + Body = Instantiate(go, transform); + UmaAnimator = Body.GetComponent(); + + if (IsMini) + { + UpBodyBone = Body.transform.Find("Position/Hip").gameObject; + } + else + { + UpBodyBone = Body.GetComponent()._assetTable["upbody_ctrl"] as GameObject; + } + + if (IsGeneric) + { + List textures = GenericBodyTextures; + string costumeIdShort = VarCostumeIdShort, + costumeIdLong = VarCostumeIdLong, + height = VarHeight, + skin = VarSkin, + socks = VarSocks, + bust = VarBust; + + foreach (Renderer r in Body.GetComponentsInChildren()) + { + foreach (Material m in r.sharedMaterials) + { + string mainTex = "", toonMap = "", tripleMap = "", optionMap = "", zekkenNumberTex = ""; + + if (IsMini) + { + m.SetTexture("_MainTex", textures[0]); + } + else + { + + if (m.shader.name.Contains("Noline") && m.shader.name.Contains("TSER")) + { + var s = Builder.ShaderList.Find(a => a.name == m.shader.name.Replace("Noline", "")); //Generic costume shader need to change manually. + if (s) + { + m.shader = s; + } + } + + //BodyAlapha's shader need to change manually. + if (m.name.Contains("bdy")) + { + if (m.name.Contains("Alpha")) + { + m.shader = Builder.bodyAlphaShader; + } + else + { + //some costume use area texture + var areaTex = UmaViewerMain.Instance.AbChara.FirstOrDefault(a => a.Name.StartsWith(UmaDatabaseController.BodyPath + $"bdy{costumeIdShort}/textures") && a.Name.EndsWith("area")); + if (areaTex != null) + { + LoadTextures(areaTex); + m.SetTexture("_MaskColorTex", textures.FirstOrDefault(t => t.name.Contains(costumeIdShort) && t.name.EndsWith("area"))); + SetMaskColor(m, IsMob ? MobDressColor : CharaData, IsMob); + } + } + } + + switch (costumeIdShort.Split('_')[0]) //costume ID + { + case "0001": + switch (r.sharedMaterials.ToList().IndexOf(m)) + { + case 0: + mainTex = $"tex_bdy{costumeIdShort}_00_waku0_diff"; + toonMap = $"tex_bdy{costumeIdShort}_00_waku0_shad_c"; + tripleMap = $"tex_bdy{costumeIdShort}_00_waku0_base"; + optionMap = $"tex_bdy{costumeIdShort}_00_waku0_ctrl"; + break; + case 1: + mainTex = $"tex_bdy{costumeIdShort}_00_{skin}_{bust}_{socks.PadLeft(2, '0')}_diff"; + toonMap = $"tex_bdy{costumeIdShort}_00_{skin}_{bust}_{socks.PadLeft(2, '0')}_shad_c"; + tripleMap = $"tex_bdy{costumeIdShort}_00_0_{bust}_00_base"; + optionMap = $"tex_bdy{costumeIdShort}_00_0_{bust}_00_ctrl"; + break; + case 2: + int color = UnityEngine.Random.Range(0, 4); + mainTex = $"tex_bdy0001_00_zekken{color}_{bust}_diff"; + toonMap = $"tex_bdy0001_00_zekken{color}_{bust}_shad_c"; + tripleMap = $"tex_bdy0001_00_zekken0_{bust}_base"; + optionMap = $"tex_bdy0001_00_zekken0_{bust}_ctrl"; + break; + } + + zekkenNumberTex = $"tex_bdy0001_00_num{UnityEngine.Random.Range(1, 18):d2}"; + break; + case "0003": + mainTex = $"tex_bdy{costumeIdShort}_00_{skin}_{bust}_diff"; + toonMap = $"tex_bdy{costumeIdShort}_00_{skin}_{bust}_shad_c"; + tripleMap = $"tex_bdy{costumeIdShort}_00_0_{bust}_base"; + optionMap = $"tex_bdy{costumeIdShort}_00_0_{bust}_ctrl"; + break; + case "0006": + mainTex = $"tex_bdy{costumeIdLong}_{skin}_{bust}_{"00"}_diff"; + toonMap = $"tex_bdy{costumeIdLong}_{skin}_{bust}_{"00"}_shad_c"; + tripleMap = $"tex_bdy{costumeIdLong}_0_{bust}_00_base"; + optionMap = $"tex_bdy{costumeIdLong}_0_{bust}_00_ctrl"; + break; + case "0009": + mainTex = $"tex_bdy{costumeIdLong}_{skin}_{bust}_{"00"}_diff"; + toonMap = $"tex_bdy{costumeIdLong}_{skin}_{bust}_{"00"}_shad_c"; + tripleMap = $"tex_bdy{costumeIdLong}_0_{bust}_00_base"; + optionMap = $"tex_bdy{costumeIdLong}_0_{bust}_00_ctrl"; + break; + default: + mainTex = $"tex_bdy{costumeIdLong}_{skin}_{bust}_diff"; + toonMap = $"tex_bdy{costumeIdLong}_{skin}_{bust}_shad_c"; + tripleMap = $"tex_bdy{costumeIdLong}_0_{bust}_base"; + optionMap = $"tex_bdy{costumeIdLong}_0_{bust}_ctrl"; + break; + } + Debug.Log("Looking for texture " + mainTex); + m.SetTexture("_MainTex", textures.FirstOrDefault(t => t.name == mainTex)); + m.SetTexture("_ToonMap", textures.FirstOrDefault(t => t.name == toonMap)); + m.SetTexture("_TripleMaskMap", textures.FirstOrDefault(t => t.name == tripleMap)); + m.SetTexture("_OptionMaskMap", textures.FirstOrDefault(t => t.name == optionMap)); + + if (!string.IsNullOrEmpty(zekkenNumberTex)) + m.SetTexture("_ZekkenNumberTex", textures.FirstOrDefault(t => t.name == zekkenNumberTex)); + } + } + } + } + else + { + foreach (Renderer r in Body.GetComponentsInChildren()) + { + foreach (Material m in r.sharedMaterials) + { + //BodyAlapha's shader need to change manually. + if (m.name.Contains("bdy") && m.name.Contains("Alpha")) + { + m.shader = Builder.bodyAlphaShader; + } + } + } + } + } + + public void LoadHead(UmaDatabaseEntry entry) + { + GameObject go = entry.Load().Get(); + var textures = MobHeadTextures; + GameObject head = Instantiate(go, transform); + Head = head; + + //Some setting for Head + EnableEyeTracking = UI.EnableEyeTracking; + + foreach (Renderer r in head.GetComponentsInChildren()) + { + foreach (Material m in r.sharedMaterials) + { + if (head.name.Contains("mchr")) + { + if (r.name.Contains("Hair")) + { + Tail = head; + } + if (r.name == "M_Face") + { + m.SetTexture("_MainTex", MiniHeadTextures.First(t => t.name.Contains("face") && t.name.Contains("diff"))); + } + if (r.name == "M_Cheek") + { + m.CopyPropertiesFromMaterial(Builder.TransMaterialCharas); + m.SetTexture("_MainTex", MiniHeadTextures.First(t => t.name.Contains("cheek"))); + } + if (r.name == "M_Mouth") + { + m.SetTexture("_MainTex", MiniHeadTextures.First(t => t.name.Contains("mouth"))); + } + if (r.name == "M_Eye") + { + m.SetTexture("_MainTex", MiniHeadTextures.First(t => t.name.Contains("eye"))); + } + if (r.name.StartsWith("M_Mayu_")) + { + m.SetTexture("_MainTex", MiniHeadTextures.First(t => t.name.Contains("mayu"))); + } + } + else + { + if (IsMob) + { + if (m.name.EndsWith("eye")) + { + m.SetTexture("_MainTex", textures.LastOrDefault(t => t.name.Contains("_eye") && t.name.EndsWith("eye0"))); + m.SetTexture("_High0Tex", textures.LastOrDefault(t => t.name.Contains("_eye") && t.name.EndsWith("hi00"))); + m.SetTexture("_High1Tex", textures.LastOrDefault(t => t.name.Contains("_eye") && t.name.EndsWith("hi01"))); + m.SetTexture("_High2Tex", textures.LastOrDefault(t => t.name.Contains("_eye") && t.name.EndsWith("hi02"))); + m.SetTexture("_MaskColorTex", textures.LastOrDefault(t => t.name.Contains("_eye") && t.name.EndsWith("area"))); + SetMaskColor(m, MobHeadColor, "eye", false); + } + if (m.name.EndsWith("face")) + { + m.SetTexture("_MainTex", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("diff"))); + m.SetTexture("_ToonMap", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("shad_c"))); + m.SetTexture("_TripleMaskMap", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("base"))); + m.SetTexture("_OptionMaskMap", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("ctrl"))); + m.SetTexture("_MaskColorTex", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("area") && !t.name.Contains("_eye"))); + SetMaskColor(m, MobHeadColor, "mayu", true); + } + if (m.name.EndsWith("mayu")) + { + m.SetTexture("_MainTex", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("diff"))); + m.SetTexture("_MaskColorTex", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("area") && !t.name.Contains("_eye"))); + SetMaskColor(m, MobHeadColor, "mayu", true); + } + } + + //Glasses's shader need to change manually. + if (r.name.Contains("Hair") && r.name.Contains("Alpha")) + { + m.shader = Builder.alphaShader; + } + + //Blush Setting + if (r.name.Contains("Cheek")) + { + r.gameObject.SetActive(false); + if (IsMob) + { + CheekTex_0 = MobHeadTextures.FindLast(a => a.name.Contains("cheek0")); + CheekTex_1 = MobHeadTextures.FindLast(a => a.name.Contains("cheek1")); + } + else + { + var table = Head.GetComponent()._assetTable; + CheekTex_0 = table["cheek0"] as Texture; + CheekTex_1 = table["cheek1"] as Texture; + } + } + switch (m.shader.name) + { + case "Gallop/3D/Chara/MultiplyCheek": + m.shader = Builder.cheekShader; ; + break; + case "Gallop/3D/Chara/ToonFace/TSER": + m.shader = Builder.faceShader; + m.SetFloat("_CylinderBlend", 0.25f); + m.SetColor("_RimColor", new Color(0, 0, 0, 0)); + break; + case "Gallop/3D/Chara/ToonEye/T": + m.shader = Builder.eyeShader; + m.SetFloat("_CylinderBlend", 0.25f); + break; + case "Gallop/3D/Chara/ToonHair/TSER": + m.shader = Builder.hairShader; + m.SetFloat("_CylinderBlend", 0.25f); + break; + case "Gallop/3D/Chara/ToonMayu": + m.shader = Builder.eyebrowShader; + break; + default: + Debug.Log(m.shader.name); + // m.shader = Shader.Find("Nars/UmaMusume/Body"); + break; + } + } + } + } + + //shader effect + var assetholder = head.GetComponent(); + if (assetholder) + { + ShaderEffectData = assetholder._assetTable["chara_shader_effect"] as CharaShaderEffectData; + if (ShaderEffectData) + { + ShaderEffectData.Initialize(); + } + } + } + + public void LoadHair(UmaDatabaseEntry entry) + { + GameObject go = entry.Load().Get(); + GameObject hair = Instantiate(go, transform); + Hair = hair; + var textures = MobHeadTextures; + foreach (Renderer r in hair.GetComponentsInChildren()) + { + foreach (Material m in r.sharedMaterials) + { + + //Glasses's shader need to change manually. + if (r.name.Contains("Hair") && r.name.Contains("Alpha")) + { + m.shader = Builder.alphaShader; + } + + if (m.name.EndsWith("_hair")) + { + m.SetTexture("_MainTex", textures.FirstOrDefault(t => t.name.Contains("_hair") && t.name.EndsWith("diff"))); + m.SetTexture("_ToonMap", textures.FirstOrDefault(t => t.name.Contains("_hair") && t.name.EndsWith("shad_c"))); + m.SetTexture("_TripleMaskMap", textures.FirstOrDefault(t => t.name.Contains("_hair") && t.name.EndsWith("base"))); + m.SetTexture("_OptionMaskMap", textures.FirstOrDefault(t => t.name.Contains("_hair") && t.name.EndsWith("ctrl"))); + m.SetTexture("_MaskColorTex", textures.FirstOrDefault(t => t.name.Contains("_hair") && t.name.EndsWith("area"))); + SetMaskColor(m, MobHeadColor, "hair", true); + } + + switch (m.shader.name) + { + case "Gallop/3D/Chara/ToonHair/TSER": + m.shader = Builder.hairShader; + m.SetFloat("_CylinderBlend", 0.25f); + break; + default: + Debug.Log(m.shader.name); + // m.shader = Shader.Find("Nars/UmaMusume/Body"); + break; + } + } + } + } + + public void LoadTail(UmaDatabaseEntry entry) + { + GameObject go = entry.Load().Get(); + Tail = Instantiate(go, transform); + var textures = TailTextures; + foreach (Renderer r in Tail.GetComponentsInChildren()) + { + foreach (Material m in r.sharedMaterials) + { + m.SetTexture("_MainTex", textures.FirstOrDefault(t => t.name.EndsWith("diff"))); + m.SetTexture("_ToonMap", textures.FirstOrDefault(t => t.name.Contains("shad"))); + m.SetTexture("_TripleMaskMap", textures.FirstOrDefault(t => t.name.Contains("base"))); + m.SetTexture("_OptionMaskMap", textures.FirstOrDefault(t => t.name.Contains("ctrl"))); + if (IsMob) + { + SetMaskColor(m, MobHeadColor, "tail", true); + } + } + } + } + + public void LoadTear(UmaDatabaseEntry entry) + { + GameObject go = entry.Load().Get(); + if (go.name.EndsWith("000")) + { + TearPrefab_0 = go; + } + else if (go.name.EndsWith("001")) + { + TearPrefab_1 = go; + } + } + + private void SetMaskColor(Material mat, DataRow colordata, bool IsMob) + { + mat.EnableKeyword("USE_MASK_COLOR"); + Color c1, c2, c3, c4, c5, c6, t1, t2, t3, t4, t5, t6; + if (IsMob) + { + ColorUtility.TryParseHtmlString(colordata["color_r1"].ToString(), out c1); + ColorUtility.TryParseHtmlString(colordata["color_r2"].ToString(), out c2); + ColorUtility.TryParseHtmlString(colordata["color_g1"].ToString(), out c3); + ColorUtility.TryParseHtmlString(colordata["color_g2"].ToString(), out c4); + ColorUtility.TryParseHtmlString(colordata["color_b1"].ToString(), out c5); + ColorUtility.TryParseHtmlString(colordata["color_b2"].ToString(), out c6); + ColorUtility.TryParseHtmlString(colordata["toon_color_r1"].ToString(), out t1); + ColorUtility.TryParseHtmlString(colordata["toon_color_r2"].ToString(), out t2); + ColorUtility.TryParseHtmlString(colordata["toon_color_g1"].ToString(), out t3); + ColorUtility.TryParseHtmlString(colordata["toon_color_g2"].ToString(), out t4); + ColorUtility.TryParseHtmlString(colordata["toon_color_b1"].ToString(), out t5); + ColorUtility.TryParseHtmlString(colordata["toon_color_b2"].ToString(), out t6); + } + else + { + ColorUtility.TryParseHtmlString("#" + colordata["image_color_main"].ToString(), out c1); + ColorUtility.TryParseHtmlString("#" + colordata["image_color_sub"].ToString(), out c2); + ColorUtility.TryParseHtmlString("#" + colordata["ui_color_sub"].ToString(), out c3); + ColorUtility.TryParseHtmlString("#" + colordata["ui_color_sub"].ToString(), out c4); + ColorUtility.TryParseHtmlString("#" + colordata["ui_training_color_1"].ToString(), out c5); + ColorUtility.TryParseHtmlString("#" + colordata["ui_training_color_2"].ToString(), out c6); + float toonstrength = 0.8f; + t1 = c1 * toonstrength; + t2 = c2 * toonstrength; + t3 = c3 * toonstrength; + t4 = c4 * toonstrength; + t5 = c5 * toonstrength; + t6 = c6 * toonstrength; + } + + mat.SetColor("_MaskColorR1", c1); + mat.SetColor("_MaskColorR2", c2); + mat.SetColor("_MaskColorG1", c3); + mat.SetColor("_MaskColorG2", c4); + mat.SetColor("_MaskColorB1", c5); + mat.SetColor("_MaskColorB2", c6); + mat.SetColor("_MaskToonColorR1", t1); + mat.SetColor("_MaskToonColorR2", t2); + mat.SetColor("_MaskToonColorG1", t3); + mat.SetColor("_MaskToonColorG2", t4); + mat.SetColor("_MaskToonColorB1", t5); + mat.SetColor("_MaskToonColorB2", t6); + } + + private void SetMaskColor(Material mat, DataRow colordata, string prefix, bool hastoon) + { + mat.EnableKeyword("USE_MASK_COLOR"); + Color c1, c2, c3, c4, c5, c6, t1, t2, t3, t4, t5, t6; + ColorUtility.TryParseHtmlString(colordata[$"{prefix}_color_r1"].ToString(), out c1); + ColorUtility.TryParseHtmlString(colordata[$"{prefix}_color_r2"].ToString(), out c2); + ColorUtility.TryParseHtmlString(colordata[$"{prefix}_color_g1"].ToString(), out c3); + ColorUtility.TryParseHtmlString(colordata[$"{prefix}_color_g2"].ToString(), out c4); + ColorUtility.TryParseHtmlString(colordata[$"{prefix}_color_b1"].ToString(), out c5); + ColorUtility.TryParseHtmlString(colordata[$"{prefix}_color_b2"].ToString(), out c6); + mat.SetColor("_MaskColorR1", c1); + mat.SetColor("_MaskColorR2", c2); + mat.SetColor("_MaskColorG1", c3); + mat.SetColor("_MaskColorG2", c4); + mat.SetColor("_MaskColorB1", c5); + mat.SetColor("_MaskColorB2", c6); + if (hastoon) + { + ColorUtility.TryParseHtmlString(colordata[$"{prefix}_toon_color_r1"].ToString(), out t1); + ColorUtility.TryParseHtmlString(colordata[$"{prefix}_toon_color_r2"].ToString(), out t2); + ColorUtility.TryParseHtmlString(colordata[$"{prefix}_toon_color_g1"].ToString(), out t3); + ColorUtility.TryParseHtmlString(colordata[$"{prefix}_toon_color_g2"].ToString(), out t4); + ColorUtility.TryParseHtmlString(colordata[$"{prefix}_toon_color_b1"].ToString(), out t5); + ColorUtility.TryParseHtmlString(colordata[$"{prefix}_toon_color_b2"].ToString(), out t6); + mat.SetColor("_MaskToonColorR1", t1); + mat.SetColor("_MaskToonColorR2", t2); + mat.SetColor("_MaskToonColorG1", t3); + mat.SetColor("_MaskToonColorG2", t4); + mat.SetColor("_MaskToonColorB1", t5); + mat.SetColor("_MaskToonColorB2", t6); + } + } + + public void LoadPhysics(UmaDatabaseEntry entry) + { + GameObject go = entry.Load().Get(); + if (!PhysicsContainer) + { + PhysicsContainer = new GameObject("PhysicsController"); + PhysicsContainer.transform.SetParent(transform); + } + Instantiate(go, PhysicsContainer.transform); + } + + public void LoadAnimation(UmaDatabaseEntry entry) + { + if (UI.LiveTime) + { + return; + } + + var aClip = entry.Load().Get(); + + if (UmaAnimator) + { + Debug.Log("LiveTime" + UI.LiveTime.ToString()); + aClip.name = entry.Name; // Need a complete path to find dependencies + LoadAnimation(aClip); + return; + } + + if (aClip.name.Contains("tear")) + { + return; + } + } + + private void LoadAnimation(AnimationClip clip) + { + if (clip.name.EndsWith("_s")) + { + OverrideController["clip_s"] = clip; + } + else if (clip.name.EndsWith("_e")) + { + OverrideController["clip_e"] = clip; + } + else if (clip.name.Contains("tail")) + { + if (IsMini) return; + UpBodyReset(); + OverrideController["clip_t"] = clip; + UmaAnimator.Play("motion_t", 1, 0); + } + else if (clip.name.EndsWith("_face")) + { + if (IsMini) return; + LoadFaceAnimation(clip); + } + else if (clip.name.EndsWith("_ear")) + { + if (IsMini) return; + LoadEarAnimation(clip); + } + else if (clip.name.EndsWith("_pos")) + { + if (IsMini) return; + OverrideController["clip_p"] = clip; + UmaAnimator.Play("motion_1", 2, 0); + } + else if (clip.name.EndsWith("_cam")) + { + Builder.SetPreviewCamera(clip); + } + else if (clip.name.Contains("_loop")) + { + UpBodyReset(); + if (isAnimatorControl && FaceDrivenKeyTarget) + { + FaceDrivenKeyTarget.ResetLocator(); + isAnimatorControl = false; + } + + if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/facial")}_face", out UmaDatabaseEntry entry)) + { + LoadAnimation(entry); + } + + if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/facial")}_ear", out entry)) + { + LoadAnimation(entry); + } + + UmaDatabaseEntry motion_e = null, motion_s = null; + if (Main.AbList.TryGetValue(clip.name.Replace("_loop", "_s"), out motion_s)) + { + LoadAnimation(motion_s); + } + + if (OverrideController["clip_2"].name.Contains("_loop")) + { + if (!OverrideController["clip_2"].name.Contains("hom_"))//home end animation not for interpolation + { + if (Main.AbList.TryGetValue(OverrideController["clip_2"].name.Replace("_loop", "_e"), out motion_e)) + { + LoadAnimation(motion_e); + } + } + } + + Builder.SetPreviewCamera(null); + OverrideController["clip_1"] = OverrideController["clip_2"]; + OverrideController["clip_2"] = clip; + UmaAnimator.Play("motion_1", -1, 0); + UmaAnimator.SetTrigger((motion_s != null && motion_e != null) ? "next_e" : ((motion_s != null) ? "next_s" : "next")); + } + else + { + if (FaceDrivenKeyTarget) + { + FaceDrivenKeyTarget.ResetLocator(); + isAnimatorControl = false; + } + UpBodyReset(); + UmaAnimator.Rebind(); + OverrideController["clip_2"] = clip; + // If Cut-in, play immediately without state interpolation + if (clip.name.Contains("crd") || clip.name.Contains("res_chr")) + { + if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/facial")}_face", out UmaDatabaseEntry facialMotion)) + { + LoadAnimation(facialMotion); + } + + if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/facial")}_ear", out UmaDatabaseEntry earMotion)) + { + LoadAnimation(earMotion); + } + + if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/camera")}_cam", out UmaDatabaseEntry cameraMotion)) + { + LoadAnimation(cameraMotion); + } + + if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/position")}_pos", out UmaDatabaseEntry posMotion)) + { + LoadAnimation(posMotion); + } + + if (IsMini) + { + Builder.SetPreviewCamera(null); + } + + if (clip.name.Contains("_cti_crd")) + { + var dir = Path.GetDirectoryName(clip.name).Replace("\\", "/"); + string[] param = Path.GetFileName(clip.name).Split('_'); + if (param.Length > 4) + { + int index = int.Parse(param[4]); + if (index == 1) + { + var cur = index + 1; + while (true) + { + var nextSearch = $"{dir}/{param[0]}_{param[1]}_{param[2]}_{param[3]}_{cur.ToString().PadLeft(2, '0')}"; + if (Main.AbList.TryGetValue(nextSearch, out UmaDatabaseEntry result)) + { + UmaAssetManager.LoadAssetBundle(result); + cur++; + } + else break; + } + } + + index++; + var next = $"{dir}/{param[0]}_{param[1]}_{param[2]}_{param[3]}_{index.ToString().PadLeft(2, '0')}"; + if (Main.AbList.TryGetValue(next, out UmaDatabaseEntry nextMotion)) + { + var aevent = new AnimationEvent + { + time = clip.length * 0.99f, + stringParameter = (nextMotion != null ? nextMotion.Name : null), + functionName = (nextMotion != null ? "SetNextAnimationCut" : "SetEndAnimationCut") + }; + clip.AddEvent(aevent); + } + } + } + + UmaAnimator.Play("motion_2", 0, 0); + } + else + { + Builder.SetPreviewCamera(null); + + //Some animations have facial animation + if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/facial")}_face", out UmaDatabaseEntry facialMotion)) + { + LoadAnimation(facialMotion); + } + + if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/facial")}_ear", out UmaDatabaseEntry earMotion)) + { + LoadAnimation(earMotion); + } + + UmaAnimator.Play("motion_2", 0, 0); + } + } + } + + private void LoadFaceAnimation(AnimationClip clip) + { + if (clip.name.Contains("_s")) + { + FaceOverrideController["clip_s"] = clip; + } + else if (clip.name.Contains("_e")) + { + FaceOverrideController["clip_e"] = clip; + } + else if (clip.name.Contains("_loop")) + { + isAnimatorControl = true; + FaceDrivenKeyTarget.ResetLocator(); + UmaDatabaseEntry motion_e = null; + UmaDatabaseEntry motion_s = null; + if (Main.AbList.TryGetValue(clip.name.Replace("_loop", "_s"), out motion_s)) + { + LoadAnimation(motion_s); + } + + if (FaceOverrideController["clip_2"].name.Contains("_loop")) + { + if (!FaceOverrideController["clip_2"].name.Contains("hom_"))//home end animation not for interpolation + { + if (Main.AbList.TryGetValue(FaceOverrideController["clip_2"].name.Replace("_loop", "_e"), out motion_e)) + { + LoadAnimation(motion_e); + } + } + } + + FaceOverrideController["clip_1"] = FaceOverrideController["clip_2"]; + FaceOverrideController["clip_2"] = clip; + UmaFaceAnimator.Play("motion_1", 0, 0); + UmaFaceAnimator.SetTrigger((motion_s != null && motion_e != null) ? "next_e" : ((motion_s != null) ? "next_s" : "next")); + } + else + { + isAnimatorControl = true; + FaceDrivenKeyTarget.ResetLocator(); + FaceOverrideController["clip_2"] = clip; + UmaFaceAnimator.Play("motion_2", 0, 0); + } + } + + private void LoadEarAnimation(AnimationClip clip) + { + if (clip.name.Contains("_s")) + { + FaceOverrideController["clip_s_ear"] = clip; + } + else if (clip.name.Contains("_e")) + { + FaceOverrideController["clip_e_ear"] = clip; + } + else if (clip.name.Contains("_loop")) + { + UmaDatabaseEntry motion_e = null; + UmaDatabaseEntry motion_s = null; + if (Main.AbList.TryGetValue(clip.name.Replace("_loop", "_s"), out motion_s)) + { + LoadAnimation(motion_s); + } + + if (FaceOverrideController["clip_2_ear"].name.Contains("_loop")) + { + if (!FaceOverrideController["clip_2_ear"].name.Contains("hom_"))//home end animation not for interpolation + { + if (Main.AbList.TryGetValue(FaceOverrideController["clip_2_ear"].name.Replace("_loop", "_e"), out motion_e)) + { + LoadAnimation(motion_e); + } + } + } + + FaceOverrideController["clip_1_ear"] = FaceOverrideController["clip_2_ear"]; + FaceOverrideController["clip_2_ear"] = clip; + UmaFaceAnimator.Play("motion_1", 1, 0); + UmaFaceAnimator.SetTrigger((motion_s != null && motion_e != null) ? "next_e_ear" : ((motion_s != null) ? "next_s_ear" : "next_ear")); + } + else + { + if (FaceOverrideController["clip_2"].name == "clip_2") + { + isAnimatorControl = true; + FaceDrivenKeyTarget.ResetLocator(); + } + FaceOverrideController["clip_2_ear"] = clip; + UmaFaceAnimator.Play("motion_2", 1, 0); + } + } + + public void SetNextAnimationCut(string cutName) + { + UmaViewerMain.Instance.AbList.TryGetValue(cutName, out UmaDatabaseEntry asset); + LoadAnimation(asset); + } + + public void SetEndAnimationCut() + { + UmaViewerUI.Instance.AnimationPause(); + } +} diff --git a/Assets/Scripts/UmaContainerCharacter.cs.meta b/Assets/Scripts/UmaContainerCharacter.cs.meta new file mode 100644 index 0000000..6c261d9 --- /dev/null +++ b/Assets/Scripts/UmaContainerCharacter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b7c6a9fc3cd459843a63b765a5223b38 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UmaContainerProp.cs b/Assets/Scripts/UmaContainerProp.cs new file mode 100644 index 0000000..092c9c6 --- /dev/null +++ b/Assets/Scripts/UmaContainerProp.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using UnityEngine; + +public class UmaContainerProp : UmaContainer +{ + public void LoadProp(UmaDatabaseEntry entry, Transform SetParent = null) + { + var go = entry.Load().Get(); + var prop = Instantiate(go, SetParent ? SetParent : this.transform); + + /* + foreach (Renderer r in prop.GetComponentsInChildren()) + { + foreach (Material m in r.sharedMaterials) + { + //Shaders can be differentiated by checking m.shader.name + m.shader = Shader.Find("Unlit/Transparent Cutout"); + } + } + */ + } +} diff --git a/Assets/Scripts/UmaContainerProp.cs.meta b/Assets/Scripts/UmaContainerProp.cs.meta new file mode 100644 index 0000000..27341fe --- /dev/null +++ b/Assets/Scripts/UmaContainerProp.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 05abd4720709e3647ba1a239f87def58 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs index 2a1a7bd..64c245b 100644 --- a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs +++ b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs @@ -1,42 +1,8 @@ using System.Collections.Generic; using UnityEngine; using Gallop; -using System.IO; -using static UmaViewerUI; using System; -public class UmaDatabaseEntry -{ - public UmaFileType Type; - public string Name; - public string Url; - public string Prerequisites; - public string FilePath - { - get - { - var path = $"{Config.Instance.MainPath}\\dat\\{Url.Substring(0, 2)}\\{Url}"; - if (!File.Exists(path) && Config.Instance.WorkMode == WorkMode.Standalone) - { - DownloadAsset(this); - } - return path; - } - } - - //TODO Make it async - public static void DownloadAsset(UmaDatabaseEntry entry) - { - var path = $"{Config.Instance.MainPath}\\dat\\{entry.Url.Substring(0, 2)}\\{entry.Url}"; - Debug.Log("Downloading:" + entry.Name); - UmaViewerDownload.DownloadAssetSync(entry, path , delegate(string msg, UIMessageType type) - { - Instance.ShowMessage(msg, type); - }); - } - -} - public class UmaCharaData { public int id; diff --git a/Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs b/Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs new file mode 100644 index 0000000..36a7e50 --- /dev/null +++ b/Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs @@ -0,0 +1,66 @@ +using System.IO; +using UnityEngine; +using System.Linq; +using System.Collections.Generic; + +public class UmaDatabaseEntry +{ + public UmaFileType Type; + public string Name; + public string Url; + public string Checksum; + public string Prerequisites; + public AssetBundle LoadedBundle; + public List Assets = new List(); + public Dictionary AssetNames = new Dictionary(); + + public bool IsLoaded() + { + return UmaAssetManager.Exist(this); + } + + public Object Get(string name) + { + return Assets.FirstOrDefault(a => a.name == name); + } + + public T Get() + { + return (T)System.Convert.ChangeType(Assets.FirstOrDefault(a => a.GetType() == typeof(T)), typeof(T)); + } + + public string FilePath + { + get + { + var path = $"{Config.Instance.MainPath}\\dat\\{Url.Substring(0, 2)}\\{Url}"; + if (!File.Exists(path) && Config.Instance.WorkMode == WorkMode.Standalone) + { + DownloadAsset(this); + } + return path; + } + } + + public UmaDatabaseEntry Load(bool withtDependencies = true) + { + UmaAssetManager.LoadAssetBundle(this, isRecursive: withtDependencies); + return this; + } + + public void Unload(bool unloadAllObjects) + { + UmaAssetManager.UnloadBundle(this, unloadAllObjects); + } + + //TODO Make it async + public static void DownloadAsset(UmaDatabaseEntry entry) + { + var path = $"{Config.Instance.MainPath}\\dat\\{entry.Url.Substring(0, 2)}\\{entry.Url}"; + UmaViewerDownload.DownloadAssetSync(entry, path, delegate (string msg, UIMessageType type) + { + UmaViewerUI.Instance.ShowMessage(msg, type); + }); + } + +} \ No newline at end of file diff --git a/Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs.meta b/Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs.meta new file mode 100644 index 0000000..df19472 --- /dev/null +++ b/Assets/Scripts/UmaDatabase/UmaDatabaseEntry.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2738c1f730a360045b019ee4912535bf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 1b7da7b..4346c1e 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -59,7 +59,7 @@ public class UmaViewerBuilder : MonoBehaviour public IEnumerator LoadUma(CharaEntry chara, string costumeId, bool mini) { int id = chara.Id; - CurrentUMAContainer = new GameObject($"Chara_{id}_{costumeId}").AddComponent(); + CurrentUMAContainer = new GameObject($"Chara_{id}_{costumeId}").AddComponent(); CurrentUMAContainer.CharaEntry = chara; if (mini) @@ -93,7 +93,7 @@ public class UmaViewerBuilder : MonoBehaviour { if (characters[i].CharaEntry.Name != "") { - CurrentUMAContainer = new GameObject($"Chara_{characters[i].CharaEntry.Id}_{characters[i].CostumeId}").AddComponent(); + CurrentUMAContainer = new GameObject($"Chara_{characters[i].CharaEntry.Id}_{characters[i].CostumeId}").AddComponent(); if (characters[i].CharaEntry.IsMob) { @@ -119,9 +119,10 @@ public class UmaViewerBuilder : MonoBehaviour private void LoadNormalUma(CharaEntry chara, string costumeId, bool loadMotion = false) { + var umaContainer = CurrentUMAContainer as UmaContainerCharacter; int id = chara.Id; - DataRow charaData = CurrentUMAContainer.CharaData; - bool genericCostume = CurrentUMAContainer.IsGeneric = costumeId.Length >= 4; + DataRow charaData = umaContainer.CharaData; + bool genericCostume = umaContainer.IsGeneric = costumeId.Length >= 4; string skin, height, socks, bust, sex, shape, costumeIdShort = ""; skin = charaData["skin"].ToString(); height = charaData["height"].ToString(); @@ -134,12 +135,12 @@ public class UmaViewerBuilder : MonoBehaviour if (genericCostume) { costumeIdShort = costumeId.Remove(costumeId.LastIndexOf('_')); - CurrentUMAContainer.VarCostumeIdShort = costumeIdShort; - CurrentUMAContainer.VarCostumeIdLong = costumeId; - CurrentUMAContainer.VarBust = bust; - CurrentUMAContainer.VarSkin = skin; - CurrentUMAContainer.VarSocks = socks; - CurrentUMAContainer.VarHeight = height; + umaContainer.VarCostumeIdShort = costumeIdShort; + umaContainer.VarCostumeIdLong = costumeId; + umaContainer.VarBust = bust; + umaContainer.VarSkin = skin; + umaContainer.VarSocks = socks; + umaContainer.VarHeight = height; // Pattern for generic body type is as follows: // @@ -194,28 +195,28 @@ public class UmaViewerBuilder : MonoBehaviour || (string.IsNullOrEmpty(texPattern4) ? false : a.Name.Contains(texPattern4)) || (string.IsNullOrEmpty(texPattern5) ? false : a.Name.Contains(texPattern5))))) { - RecursiveLoadAsset(asset1); + umaContainer.LoadTextures(asset1); } //Load Body - RecursiveLoadAsset(asset); + umaContainer.LoadBody(asset); //Load Physics if (Main.AbList.TryGetValue(UmaDatabaseController.BodyPath + $"bdy{costumeIdShort}/clothes/pfb_bdy{costumeIdShort}_cloth00", out _)) { var asset1 = Main.AbList[UmaDatabaseController.BodyPath + $"bdy{costumeIdShort}/clothes/pfb_bdy{costumeIdShort}_cloth00"]; - RecursiveLoadAsset(asset1); + umaContainer.LoadPhysics(asset1); asset1 = Main.AbList[UmaDatabaseController.BodyPath + $"bdy{costumeIdShort}/clothes/pfb_bdy{costumeIdShort}_bust{bust}_cloth00"]; - RecursiveLoadAsset(asset1); + umaContainer.LoadPhysics(asset1); } } else { - RecursiveLoadAsset(asset); + umaContainer.LoadBody(asset); //Load Physics var asset1 = Main.AbList[UmaDatabaseController.BodyPath + $"bdy{id}_{costumeId}/clothes/pfb_bdy{id}_{costumeId}_cloth00"]; - RecursiveLoadAsset(asset1); + umaContainer.LoadPhysics(asset1); asset1 = Main.AbList[UmaDatabaseController.BodyPath + $"bdy{id}_{costumeId}/clothes/pfb_bdy{id}_{costumeId}_bust_cloth00"]; - RecursiveLoadAsset(asset1); + umaContainer.LoadPhysics(asset1); } // Record Head Data @@ -260,22 +261,22 @@ public class UmaViewerBuilder : MonoBehaviour //Load Hair Textures foreach (var asset1 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith($"{UmaDatabaseController.HeadPath}chr{head_id}_{head_costumeId}/textures"))) { - RecursiveLoadAsset(asset1); + umaContainer.LoadTextures(asset1); } //Load Head - RecursiveLoadAsset(asset); + umaContainer.LoadHead(asset); //Load Physics if (isDefaultHead) { var asset1 = Main.AbList[UmaDatabaseController.HeadPath + $"chr{id}_00/clothes/pfb_chr{id}_00_cloth00"]; - RecursiveLoadAsset(asset1); + umaContainer.LoadPhysics(asset1); } else { var asset1 = Main.AbList[UmaDatabaseController.HeadPath + $"chr{head_id}_{head_costumeId}/clothes/pfb_chr{head_id}_{head_costumeId}_cloth00"]; - RecursiveLoadAsset(asset1); + umaContainer.LoadPhysics(asset1); } } @@ -290,14 +291,14 @@ public class UmaViewerBuilder : MonoBehaviour { foreach (var asset2 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith($"{tailPath}textures/tex_{tailName}_{head_id}") || a.Name.StartsWith($"{tailPath}textures/tex_{tailName}_0000"))) { - RecursiveLoadAsset(asset2); + umaContainer.LoadTextures(asset2); } - RecursiveLoadAsset(asset); + umaContainer.LoadTail(asset); //Load Physics var asset1 = Main.AbList[$"{tailPath}clothes/pfb_{tailName}_cloth00"]; - RecursiveLoadAsset(asset1); + umaContainer.LoadPhysics(asset1); } else { @@ -305,36 +306,37 @@ public class UmaViewerBuilder : MonoBehaviour } } - CurrentUMAContainer.LoadPhysics(); - CurrentUMAContainer.SetDynamicBoneEnable(UI.DynamicBoneEnable); + umaContainer.LoadPhysics(); + umaContainer.SetDynamicBoneEnable(UI.DynamicBoneEnable); LoadFaceMorph(id, costumeId); - CurrentUMAContainer.TearControllers.ForEach(a => a.SetDir(a.CurrentDir)); - CurrentUMAContainer.HeadBone = (GameObject)CurrentUMAContainer.Body.GetComponent()._assetTable["head"]; - CurrentUMAContainer.EyeHeight = CurrentUMAContainer.Head.GetComponent()._assetTableValue["head_center_offset_y"]; - CurrentUMAContainer.MergeModel(); - CurrentUMAContainer.SetHeight(-1); - CurrentUMAContainer.Initialize(!UI.isTPose); + umaContainer.TearControllers.ForEach(a => a.SetDir(a.CurrentDir)); + umaContainer.HeadBone = (GameObject)umaContainer.Body.GetComponent()._assetTable["head"]; + umaContainer.EyeHeight = umaContainer.Head.GetComponent()._assetTableValue["head_center_offset_y"]; + umaContainer.MergeModel(); + umaContainer.SetHeight(-1); + umaContainer.Initialize(!UI.isTPose); - CurrentUMAContainer.Position = CurrentUMAContainer.transform.Find("Position"); + umaContainer.Position = umaContainer.transform.Find("Position"); if (!UI.isTPose && loadMotion) { if (Main.AbList.TryGetValue($"3d/motion/event/body/chara/chr{id}_00/anm_eve_chr{id}_00_idle01_loop", out UmaDatabaseEntry entry)) { - LoadAsset(entry); + umaContainer.LoadAnimation(entry); } } } private void LoadMobUma(CharaEntry chara, string costumeId, int bodyid = -1, bool loadMotion = false) { + var umaContainer = CurrentUMAContainer as UmaContainerCharacter; int id = chara.Id; - CurrentUMAContainer.IsMob = chara.IsMob; - CurrentUMAContainer.MobDressColor = UmaDatabaseController.ReadMobDressColor(CurrentUMAContainer.CharaData["dress_color_id"].ToString()); - CurrentUMAContainer.MobHeadColor = UmaDatabaseController.ReadMobHairColor(CurrentUMAContainer.CharaData["chara_hair_color"].ToString()); + umaContainer.IsMob = chara.IsMob; + umaContainer.MobDressColor = UmaDatabaseController.ReadMobDressColor(umaContainer.CharaData["dress_color_id"].ToString()); + umaContainer.MobHeadColor = UmaDatabaseController.ReadMobHairColor(umaContainer.CharaData["chara_hair_color"].ToString()); - DataRow charaData = CurrentUMAContainer.CharaData; - bool genericCostume = CurrentUMAContainer.IsGeneric = costumeId.Length >= 4; + DataRow charaData = umaContainer.CharaData; + bool genericCostume = umaContainer.IsGeneric = costumeId.Length >= 4; string skin, height, socks, bust, sex, shape, costumeIdShort = ""; string faceid, hairid, personality; @@ -352,12 +354,12 @@ public class UmaViewerBuilder : MonoBehaviour if (genericCostume) { costumeIdShort = costumeId.Remove(costumeId.LastIndexOf('_')); - CurrentUMAContainer.VarCostumeIdShort = costumeIdShort; - CurrentUMAContainer.VarCostumeIdLong = costumeId; - CurrentUMAContainer.VarBust = bust; - CurrentUMAContainer.VarSkin = skin; - CurrentUMAContainer.VarSocks = socks; - CurrentUMAContainer.VarHeight = height; + umaContainer.VarCostumeIdShort = costumeIdShort; + umaContainer.VarCostumeIdLong = costumeId; + umaContainer.VarBust = bust; + umaContainer.VarSkin = skin; + umaContainer.VarSocks = socks; + umaContainer.VarHeight = height; // Pattern for generic body type is as follows: // @@ -415,29 +417,29 @@ public class UmaViewerBuilder : MonoBehaviour || (string.IsNullOrEmpty(texPattern4) ? false : a.Name.Contains(texPattern4)) || (string.IsNullOrEmpty(texPattern5) ? false : a.Name.Contains(texPattern5))))) { - RecursiveLoadAsset(asset1); + umaContainer.LoadTextures(asset1); } //Load Body - RecursiveLoadAsset(asset); + umaContainer.LoadBody(asset); //Load Physics if (Main.AbList.TryGetValue(UmaDatabaseController.BodyPath + $"bdy{costumeIdShort}/clothes/pfb_bdy{costumeIdShort}_cloth00", out _)) { var asset1 = Main.AbList[UmaDatabaseController.BodyPath + $"bdy{costumeIdShort}/clothes/pfb_bdy{costumeIdShort}_cloth00"]; - RecursiveLoadAsset(asset1); + umaContainer.LoadPhysics(asset1); asset1 = Main.AbList[UmaDatabaseController.BodyPath + $"bdy{costumeIdShort}/clothes/pfb_bdy{costumeIdShort}_bust{bust}_cloth00"]; - RecursiveLoadAsset(asset1); + umaContainer.LoadPhysics(asset1); } } else { - RecursiveLoadAsset(asset); + umaContainer.LoadBody(asset); //Load Physics var asset1 = Main.AbList[UmaDatabaseController.BodyPath + $"bdy{bodyid}_{costumeId}/clothes/pfb_bdy{bodyid}_{costumeId}_cloth00"]; - RecursiveLoadAsset(asset1); + umaContainer.LoadPhysics(asset1); asset1 = Main.AbList[UmaDatabaseController.BodyPath + $"bdy{bodyid}_{costumeId}/clothes/pfb_bdy{bodyid}_{costumeId}_bust_cloth00"]; - RecursiveLoadAsset(asset1); + umaContainer.LoadPhysics(asset1); } // Record Head Data @@ -469,28 +471,28 @@ public class UmaViewerBuilder : MonoBehaviour if (asset1.Name.Contains($"tex_chr{head_s}_{head_costumeId}_face{faceid.PadLeft(3, '0')}_0") || asset1.Name.Contains($"tex_chr{head_s}_{head_costumeId}_face{faceid.PadLeft(3, '0')}_{skin}")) { - RecursiveLoadAsset(asset1); + umaContainer.LoadTextures(asset1); } if (asset1.Name.Contains($"tex_chr{head_s}_{head_costumeId}_hair{hairid.PadLeft(3, '0')}")) { - RecursiveLoadAsset(asset1); + umaContainer.LoadTextures(asset1); } } //Load face - RecursiveLoadAsset(asset); + umaContainer.LoadHead(asset); //Load hair - RecursiveLoadAsset(hairasset); + umaContainer.LoadHair(hairasset); - CurrentUMAContainer.MergeHairModel(); + umaContainer.MergeHairModel(); //Load Physics if (isDefaultHead) { if (Main.AbList.TryGetValue($"{UmaDatabaseController.HeadPath}chr{head_s}_00/clothes/pfb_chr{head_s}_00_hair{hairid.PadLeft(3, '0')}_cloth00", out UmaDatabaseEntry asset1)) { - RecursiveLoadAsset(asset1); + umaContainer.LoadPhysics(asset1); } } } @@ -505,15 +507,15 @@ public class UmaViewerBuilder : MonoBehaviour { foreach (var asset1 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith($"{tailPath}textures/tex_{tailName}_{head_s}") || a.Name.StartsWith($"{tailPath}textures/tex_{tailName}_0000"))) { - RecursiveLoadAsset(asset1); + umaContainer.LoadTextures(asset1); } - RecursiveLoadAsset(asset); + umaContainer.LoadTail(asset); //Load Physics if (Main.AbList.TryGetValue($"{tailPath}clothes/pfb_{tailName}_cloth00", out UmaDatabaseEntry asset2)) { - RecursiveLoadAsset(asset2); + umaContainer.LoadPhysics(asset2); } } else @@ -522,36 +524,37 @@ public class UmaViewerBuilder : MonoBehaviour } } - CurrentUMAContainer.LoadPhysics(); //Need to load physics before loading FacialMorph - CurrentUMAContainer.SetDynamicBoneEnable(UI.DynamicBoneEnable); + umaContainer.LoadPhysics(); //Need to load physics before loading FacialMorph + umaContainer.SetDynamicBoneEnable(UI.DynamicBoneEnable); //Load FacialMorph LoadFaceMorph(id, costumeId); - CurrentUMAContainer.TearControllers.ForEach(a => a.SetDir(a.CurrentDir)); - CurrentUMAContainer.HeadBone = (GameObject)CurrentUMAContainer.Body.GetComponent()._assetTable["head"]; - CurrentUMAContainer.EyeHeight = CurrentUMAContainer.Head.GetComponent()._assetTableValue["head_center_offset_y"]; - CurrentUMAContainer.MergeModel(); - CurrentUMAContainer.SetHeight(-1); - CurrentUMAContainer.Initialize(!UI.isTPose); + umaContainer.TearControllers.ForEach(a => a.SetDir(a.CurrentDir)); + umaContainer.HeadBone = (GameObject)umaContainer.Body.GetComponent()._assetTable["head"]; + umaContainer.EyeHeight = umaContainer.Head.GetComponent()._assetTableValue["head_center_offset_y"]; + umaContainer.MergeModel(); + umaContainer.SetHeight(-1); + umaContainer.Initialize(!UI.isTPose); - CurrentUMAContainer.Position = CurrentUMAContainer.transform.Find("Position"); + umaContainer.Position = umaContainer.transform.Find("Position"); if (!UI.isTPose && loadMotion) { if (Main.AbList.TryGetValue($"3d/motion/event/body/type00/anm_eve_type00_homestand{personality.PadLeft(2, '0')}_loop", out UmaDatabaseEntry entry)) { - LoadAsset(entry); + umaContainer.LoadAnimation(entry); } } } private void LoadMiniUma(CharaEntry chara, string costumeId) { + var umaContainer = CurrentUMAContainer as UmaContainerCharacter; int id = chara.Id; - DataRow charaData = CurrentUMAContainer.CharaData; - CurrentUMAContainer.IsMini = true; - bool isGeneric = CurrentUMAContainer.IsGeneric = costumeId.Length >= 4; + DataRow charaData = umaContainer.CharaData; + umaContainer.IsMini = true; + bool isGeneric = umaContainer.IsGeneric = costumeId.Length >= 4; string skin = charaData["skin"].ToString(), height = charaData["height"].ToString(), socks = charaData["socks"].ToString(), @@ -588,13 +591,13 @@ public class UmaViewerBuilder : MonoBehaviour //Load Body Textures foreach (var asset1 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith("3d/chara/mini/body/") && a.Name.Contains(texPattern1))) { - RecursiveLoadAsset(asset1); + umaContainer.LoadTextures(asset1); } //Load Body - RecursiveLoadAsset(asset); + umaContainer.LoadBody(asset); } else - RecursiveLoadAsset(asset); + umaContainer.LoadBody(asset); string hair = $"3d/chara/mini/head/mchr{id}_{costumeId}/pfb_mchr{id}_{costumeId}_hair"; Main.AbList.TryGetValue(hair, out asset); @@ -611,19 +614,19 @@ public class UmaViewerBuilder : MonoBehaviour { foreach (var asset1 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith($"3d/chara/mini/head/mchr{id}_{costumeId}/textures"))) { - RecursiveLoadAsset(asset1); + umaContainer.LoadTextures(asset1); } } else { foreach (var asset1 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith($"3d/chara/mini/head/mchr{id}_00/textures"))) { - RecursiveLoadAsset(asset1); + umaContainer.LoadTextures(asset1); } } //Load Hair - RecursiveLoadAsset(asset); + umaContainer.LoadHead(asset); } string head = $"3d/chara/mini/head/mchr0001_00/pfb_mchr0001_00_face0"; @@ -633,14 +636,14 @@ public class UmaViewerBuilder : MonoBehaviour //Load Head Textures foreach (var asset1 in UmaViewerMain.Instance.AbChara.Where(a => a.Name.StartsWith($"3d/chara/mini/head/mchr0001_00/textures/tex_mchr0001_00_face0_{skin}"))) { - RecursiveLoadAsset(asset1); + umaContainer.LoadTextures(asset1); } //Load Head - RecursiveLoadAsset(asset); + umaContainer.LoadHead(asset); } - CurrentUMAContainer.MergeModel(); - var matList = new List(CurrentUMAContainer.GetComponentsInChildren()); + umaContainer.MergeModel(); + var matList = new List(umaContainer.GetComponentsInChildren()); var eyemat = matList.FirstOrDefault(a => a.gameObject.name.Equals("M_Eye")); var mouthmat = matList.FirstOrDefault(a => a.gameObject.name.Equals("M_Mouth")); var eyebrowLmat = matList.FirstOrDefault(a => a.gameObject.name.Equals("M_Mayu_L")); @@ -649,7 +652,7 @@ public class UmaViewerBuilder : MonoBehaviour if(Main.AbList.TryGetValue($"3d/motion/mini/event/body/chara/chr{id}_00/anm_min_eve_chr{id}_00_idle01_loop",out asset)) { - LoadAsset(asset); + umaContainer.LoadAnimation(asset); } } @@ -658,8 +661,10 @@ public class UmaViewerBuilder : MonoBehaviour UnloadProp(); UmaAssetManager.UnloadAllBundle(); - CurrentOtherContainer = new GameObject(Path.GetFileName(entry.Name)).AddComponent(); - RecursiveLoadAsset(entry); + var prop = new GameObject(Path.GetFileName(entry.Name)).AddComponent(); + prop.LoadProp(entry); + + CurrentOtherContainer = prop; } public void LoadLive(LiveEntry live, List characters) @@ -837,546 +842,21 @@ public class UmaViewerBuilder : MonoBehaviour } } - public void RecursiveLoadAsset(UmaDatabaseEntry entry, bool IsSubAsset = false, Transform SetParent = null) - { - if (!string.IsNullOrEmpty(entry.Prerequisites)) - { - foreach (string prerequisite in entry.Prerequisites.Split(';')) - { - RecursiveLoadAsset(Main.AbList[prerequisite], true, SetParent); - } - } - LoadAsset(entry, IsSubAsset, SetParent); - } - - public void LoadAsset(UmaDatabaseEntry entry, bool IsSubAsset = false, Transform SetParent = null) - { - //Debug.Log("Loading " + entry.Name); - var bundle = UmaAssetManager.LoadAssetBundle(entry, isRecursive: false); - LoadBundle(entry, bundle, IsSubAsset, SetParent); - } - - private void LoadBundle(UmaDatabaseEntry entry, AssetBundle bundle, bool IsSubAsset = false, Transform SetParent = null) - { - if (bundle.name == "shader.a") - { - if (ShadersLoaded) - { - return; - } - else - { - hairShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonhairtser.shader"); - faceShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonfacetser.shader"); - eyeShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertooneyet.shader"); - cheekShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactermultiplycheek.shader"); - eyebrowShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/charactertoonmayu.shader"); - alphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoonhairtser.shader"); - bodyAlphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoontser.shader"); - bodyBehindAlphaShader = (Shader)bundle.LoadAsset("assets/_gallop/resources/shader/3d/character/characteralphanolinetoonbehindtser.shader"); - ShadersLoaded = true; - } - } - - foreach (string name in bundle.GetAllAssetNames()) - { - object asset = bundle.LoadAsset(name); - - if (asset == null) { continue; } - //Debug.Log("Bundle:" + bundle.name + "/" + name + $" ({asset.GetType()})"); - - switch (asset) - { - case AnimationClip aClip: - { - if (UI.LiveTime) - { - break; - } - - if (CurrentUMAContainer && CurrentUMAContainer.UmaAnimator) - { - Debug.Log("LiveTime" + UI.LiveTime.ToString()); - aClip.name = entry.Name; // Need a complete path to find dependencies - LoadAnimation(aClip); - break; - } - - if (aClip.name.Contains("tear")) - { - break; - } - - //UmaAssetManager.UnloadAllBundle(); - break; - } - - case GameObject go: - { - if (bundle.name.Contains("cloth")) - { - if (!CurrentUMAContainer.PhysicsContainer) - { - CurrentUMAContainer.PhysicsContainer = new GameObject("PhysicsController"); - CurrentUMAContainer.PhysicsContainer.transform.SetParent(CurrentUMAContainer.transform); - } - Instantiate(go, CurrentUMAContainer.PhysicsContainer.transform); - } - else if (bundle.name.Contains("/head/")) - { - if (bundle.name.Contains("_hair") && !bundle.name.Contains("mchr")) - { - LoadHair(go); - } - else - { - LoadHead(go); - } - } - else if (bundle.name.Contains("/body/")) - { - LoadBody(go); - } - else if (bundle.name.Contains("/tail/")) - { - LoadTail(go); - } - else if (bundle.name.Contains("pfb_chr_tear")) - { - LoadTear(go); - } - else - { - if (!IsSubAsset) - { - LoadProp(go, SetParent); - } - } - break; - } - - case Shader sha: - if (!ShaderList.Contains(sha)) - { - ShaderList.Add(sha); - } - break; - - case Texture2D tex2D: - - if (bundle.name.Contains("/mini/head")) - { - CurrentUMAContainer.MiniHeadTextures.Add(tex2D); - } - else if (bundle.name.Contains("/tail/")) - { - CurrentUMAContainer.TailTextures.Add(tex2D); - } - else if (bundle.name.Contains("bdy0")) - { - CurrentUMAContainer.GenericBodyTextures.Add(tex2D); - } - else if (bundle.name.Contains("_face") || bundle.name.Contains("_hair")) - { - if (CurrentUMAContainer.IsMob) - CurrentUMAContainer.MobHeadTextures.Add(tex2D); - } - break; - } - } - } - - private void LoadBody(GameObject go) - { - CurrentUMAContainer.Body = Instantiate(go, CurrentUMAContainer.transform); - CurrentUMAContainer.UmaAnimator = CurrentUMAContainer.Body.GetComponent(); - - if (CurrentUMAContainer.IsMini) - { - CurrentUMAContainer.UpBodyBone = CurrentUMAContainer.Body.transform.Find("Position/Hip").gameObject; - } - else - { - CurrentUMAContainer.UpBodyBone = CurrentUMAContainer.Body.GetComponent()._assetTable["upbody_ctrl"] as GameObject; - } - - if (CurrentUMAContainer.IsGeneric) - { - List textures = CurrentUMAContainer.GenericBodyTextures; - string costumeIdShort = CurrentUMAContainer.VarCostumeIdShort, - costumeIdLong = CurrentUMAContainer.VarCostumeIdLong, - height = CurrentUMAContainer.VarHeight, - skin = CurrentUMAContainer.VarSkin, - socks = CurrentUMAContainer.VarSocks, - bust = CurrentUMAContainer.VarBust; - - foreach (Renderer r in CurrentUMAContainer.Body.GetComponentsInChildren()) - { - foreach (Material m in r.sharedMaterials) - { - string mainTex = "", toonMap = "", tripleMap = "", optionMap = "", zekkenNumberTex = ""; - - if (CurrentUMAContainer.IsMini) - { - m.SetTexture("_MainTex", textures[0]); - } - else - { - - if (m.shader.name.Contains("Noline") && m.shader.name.Contains("TSER")) - { - var s = ShaderList.Find(a => a.name == m.shader.name.Replace("Noline", "")); //Generic costume shader need to change manually. - if (s) - { - m.shader = s; - } - } - - //BodyAlapha's shader need to change manually. - if (m.name.Contains("bdy")) - { - if (m.name.Contains("Alpha")) - { - m.shader = bodyAlphaShader; - } - else - { - //some costume use area texture - var areaTex = UmaViewerMain.Instance.AbChara.FirstOrDefault(a => a.Name.StartsWith(UmaDatabaseController.BodyPath + $"bdy{costumeIdShort}/textures") && a.Name.EndsWith("area")); - if (areaTex != null) - { - RecursiveLoadAsset(areaTex); - m.SetTexture("_MaskColorTex", textures.FirstOrDefault(t => t.name.Contains(costumeIdShort) && t.name.EndsWith("area"))); - SetMaskColor(m, CurrentUMAContainer.IsMob ? CurrentUMAContainer.MobDressColor : CurrentUMAContainer.CharaData, CurrentUMAContainer.IsMob); - } - } - } - - switch (costumeIdShort.Split('_')[0]) //costume ID - { - case "0001": - switch (r.sharedMaterials.ToList().IndexOf(m)) - { - case 0: - mainTex = $"tex_bdy{costumeIdShort}_00_waku0_diff"; - toonMap = $"tex_bdy{costumeIdShort}_00_waku0_shad_c"; - tripleMap = $"tex_bdy{costumeIdShort}_00_waku0_base"; - optionMap = $"tex_bdy{costumeIdShort}_00_waku0_ctrl"; - break; - case 1: - mainTex = $"tex_bdy{costumeIdShort}_00_{skin}_{bust}_{socks.PadLeft(2, '0')}_diff"; - toonMap = $"tex_bdy{costumeIdShort}_00_{skin}_{bust}_{socks.PadLeft(2, '0')}_shad_c"; - tripleMap = $"tex_bdy{costumeIdShort}_00_0_{bust}_00_base"; - optionMap = $"tex_bdy{costumeIdShort}_00_0_{bust}_00_ctrl"; - break; - case 2: - int color = UnityEngine.Random.Range(0, 4); - mainTex = $"tex_bdy0001_00_zekken{color}_{bust}_diff"; - toonMap = $"tex_bdy0001_00_zekken{color}_{bust}_shad_c"; - tripleMap = $"tex_bdy0001_00_zekken0_{bust}_base"; - optionMap = $"tex_bdy0001_00_zekken0_{bust}_ctrl"; - break; - } - - zekkenNumberTex = $"tex_bdy0001_00_num{UnityEngine.Random.Range(1, 18):d2}"; - break; - case "0003": - mainTex = $"tex_bdy{costumeIdShort}_00_{skin}_{bust}_diff"; - toonMap = $"tex_bdy{costumeIdShort}_00_{skin}_{bust}_shad_c"; - tripleMap = $"tex_bdy{costumeIdShort}_00_0_{bust}_base"; - optionMap = $"tex_bdy{costumeIdShort}_00_0_{bust}_ctrl"; - break; - case "0006": - mainTex = $"tex_bdy{costumeIdLong}_{skin}_{bust}_{"00"}_diff"; - toonMap = $"tex_bdy{costumeIdLong}_{skin}_{bust}_{"00"}_shad_c"; - tripleMap = $"tex_bdy{costumeIdLong}_0_{bust}_00_base"; - optionMap = $"tex_bdy{costumeIdLong}_0_{bust}_00_ctrl"; - break; - case "0009": - mainTex = $"tex_bdy{costumeIdLong}_{skin}_{bust}_{"00"}_diff"; - toonMap = $"tex_bdy{costumeIdLong}_{skin}_{bust}_{"00"}_shad_c"; - tripleMap = $"tex_bdy{costumeIdLong}_0_{bust}_00_base"; - optionMap = $"tex_bdy{costumeIdLong}_0_{bust}_00_ctrl"; - break; - default: - mainTex = $"tex_bdy{costumeIdLong}_{skin}_{bust}_diff"; - toonMap = $"tex_bdy{costumeIdLong}_{skin}_{bust}_shad_c"; - tripleMap = $"tex_bdy{costumeIdLong}_0_{bust}_base"; - optionMap = $"tex_bdy{costumeIdLong}_0_{bust}_ctrl"; - break; - } - Debug.Log("Looking for texture " + mainTex); - m.SetTexture("_MainTex", textures.FirstOrDefault(t => t.name == mainTex)); - m.SetTexture("_ToonMap", textures.FirstOrDefault(t => t.name == toonMap)); - m.SetTexture("_TripleMaskMap", textures.FirstOrDefault(t => t.name == tripleMap)); - m.SetTexture("_OptionMaskMap", textures.FirstOrDefault(t => t.name == optionMap)); - - if (!string.IsNullOrEmpty(zekkenNumberTex)) - m.SetTexture("_ZekkenNumberTex", textures.FirstOrDefault(t => t.name == zekkenNumberTex)); - } - } - } - } - else - { - foreach (Renderer r in CurrentUMAContainer.Body.GetComponentsInChildren()) - { - foreach (Material m in r.sharedMaterials) - { - //BodyAlapha's shader need to change manually. - if (m.name.Contains("bdy") && m.name.Contains("Alpha")) - { - m.shader = bodyAlphaShader; - } - } - } - } - } - - private void LoadHead(GameObject go) - { - var isMob = CurrentUMAContainer.IsMob; - var textures = CurrentUMAContainer.MobHeadTextures; - GameObject head = Instantiate(go, CurrentUMAContainer.transform); - CurrentUMAContainer.Head = head; - - //Some setting for Head - CurrentUMAContainer.EnableEyeTracking = UI.EnableEyeTracking; - - foreach (Renderer r in head.GetComponentsInChildren()) - { - foreach (Material m in r.sharedMaterials) - { - if (head.name.Contains("mchr")) - { - if (r.name.Contains("Hair")) - { - CurrentUMAContainer.Tail = head; - } - if (r.name == "M_Face") - { - m.SetTexture("_MainTex", CurrentUMAContainer.MiniHeadTextures.First(t => t.name.Contains("face") && t.name.Contains("diff"))); - } - if (r.name == "M_Cheek") - { - m.CopyPropertiesFromMaterial(TransMaterialCharas); - m.SetTexture("_MainTex", CurrentUMAContainer.MiniHeadTextures.First(t => t.name.Contains("cheek"))); - } - if (r.name == "M_Mouth") - { - m.SetTexture("_MainTex", CurrentUMAContainer.MiniHeadTextures.First(t => t.name.Contains("mouth"))); - } - if (r.name == "M_Eye") - { - m.SetTexture("_MainTex", CurrentUMAContainer.MiniHeadTextures.First(t => t.name.Contains("eye"))); - } - if (r.name.StartsWith("M_Mayu_")) - { - m.SetTexture("_MainTex", CurrentUMAContainer.MiniHeadTextures.First(t => t.name.Contains("mayu"))); - } - } - else - { - if (isMob) - { - if (m.name.EndsWith("eye")) - { - m.SetTexture("_MainTex", textures.LastOrDefault(t => t.name.Contains("_eye") && t.name.EndsWith("eye0"))); - m.SetTexture("_High0Tex", textures.LastOrDefault(t => t.name.Contains("_eye") && t.name.EndsWith("hi00"))); - m.SetTexture("_High1Tex", textures.LastOrDefault(t => t.name.Contains("_eye") && t.name.EndsWith("hi01"))); - m.SetTexture("_High2Tex", textures.LastOrDefault(t => t.name.Contains("_eye") && t.name.EndsWith("hi02"))); - m.SetTexture("_MaskColorTex", textures.LastOrDefault(t => t.name.Contains("_eye") && t.name.EndsWith("area"))); - SetMaskColor(m, CurrentUMAContainer.MobHeadColor, "eye", false); - } - if (m.name.EndsWith("face")) - { - m.SetTexture("_MainTex", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("diff"))); - m.SetTexture("_ToonMap", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("shad_c"))); - m.SetTexture("_TripleMaskMap", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("base"))); - m.SetTexture("_OptionMaskMap", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("ctrl"))); - m.SetTexture("_MaskColorTex", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("area") && !t.name.Contains("_eye"))); - SetMaskColor(m, CurrentUMAContainer.MobHeadColor, "mayu", true); - } - if (m.name.EndsWith("mayu")) - { - m.SetTexture("_MainTex", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("diff"))); - m.SetTexture("_MaskColorTex", textures.LastOrDefault(t => t.name.Contains("_face") && t.name.EndsWith("area") && !t.name.Contains("_eye"))); - SetMaskColor(m, CurrentUMAContainer.MobHeadColor, "mayu", true); - } - } - - //Glasses's shader need to change manually. - if (r.name.Contains("Hair") && r.name.Contains("Alpha")) - { - m.shader = alphaShader; - } - - //Blush Setting - if (r.name.Contains("Cheek")) - { - r.gameObject.SetActive(false); - if (isMob) - { - CurrentUMAContainer.CheekTex_0 = CurrentUMAContainer.MobHeadTextures.FindLast(a => a.name.Contains("cheek0")); - CurrentUMAContainer.CheekTex_1 = CurrentUMAContainer.MobHeadTextures.FindLast(a => a.name.Contains("cheek1")); - } - else - { - var table = CurrentUMAContainer.Head.GetComponent()._assetTable; - CurrentUMAContainer.CheekTex_0 = table["cheek0"] as Texture; - CurrentUMAContainer.CheekTex_1 = table["cheek1"] as Texture; - } - } - switch (m.shader.name) - { - case "Gallop/3D/Chara/MultiplyCheek": - m.shader = cheekShader; ; - break; - case "Gallop/3D/Chara/ToonFace/TSER": - m.shader = faceShader; - m.SetFloat("_CylinderBlend", 0.25f); - m.SetColor("_RimColor", new Color(0, 0, 0, 0)); - break; - case "Gallop/3D/Chara/ToonEye/T": - m.shader = eyeShader; - m.SetFloat("_CylinderBlend", 0.25f); - break; - case "Gallop/3D/Chara/ToonHair/TSER": - m.shader = hairShader; - m.SetFloat("_CylinderBlend", 0.25f); - break; - case "Gallop/3D/Chara/ToonMayu": - m.shader = eyebrowShader; - break; - default: - Debug.Log(m.shader.name); - // m.shader = Shader.Find("Nars/UmaMusume/Body"); - break; - } - } - } - } - - //shader effect - var assetholder = head.GetComponent(); - if (assetholder) - { - CurrentUMAContainer.ShaderEffectData = assetholder._assetTable["chara_shader_effect"] as CharaShaderEffectData; - if (CurrentUMAContainer.ShaderEffectData) - { - CurrentUMAContainer.ShaderEffectData.Initialize(); - } - } - } - - private void LoadHair(GameObject go) - { - GameObject hair = Instantiate(go, CurrentUMAContainer.transform); - CurrentUMAContainer.Hair = hair; - var textures = CurrentUMAContainer.MobHeadTextures; - foreach (Renderer r in hair.GetComponentsInChildren()) - { - foreach (Material m in r.sharedMaterials) - { - - //Glasses's shader need to change manually. - if (r.name.Contains("Hair") && r.name.Contains("Alpha")) - { - m.shader = alphaShader; - } - - if (m.name.EndsWith("_hair")) - { - m.SetTexture("_MainTex", textures.FirstOrDefault(t => t.name.Contains("_hair") && t.name.EndsWith("diff"))); - m.SetTexture("_ToonMap", textures.FirstOrDefault(t => t.name.Contains("_hair") && t.name.EndsWith("shad_c"))); - m.SetTexture("_TripleMaskMap", textures.FirstOrDefault(t => t.name.Contains("_hair") && t.name.EndsWith("base"))); - m.SetTexture("_OptionMaskMap", textures.FirstOrDefault(t => t.name.Contains("_hair") && t.name.EndsWith("ctrl"))); - m.SetTexture("_MaskColorTex", textures.FirstOrDefault(t => t.name.Contains("_hair") && t.name.EndsWith("area"))); - SetMaskColor(m, CurrentUMAContainer.MobHeadColor, "hair", true); - } - - switch (m.shader.name) - { - case "Gallop/3D/Chara/ToonHair/TSER": - m.shader = hairShader; - m.SetFloat("_CylinderBlend", 0.25f); - break; - default: - Debug.Log(m.shader.name); - // m.shader = Shader.Find("Nars/UmaMusume/Body"); - break; - } - } - } - } - - private void LoadTail(GameObject go) - { - CurrentUMAContainer.Tail = Instantiate(go, CurrentUMAContainer.transform); - var textures = CurrentUMAContainer.TailTextures; - foreach (Renderer r in CurrentUMAContainer.Tail.GetComponentsInChildren()) - { - foreach (Material m in r.sharedMaterials) - { - m.SetTexture("_MainTex", textures.FirstOrDefault(t => t.name.EndsWith("diff"))); - m.SetTexture("_ToonMap", textures.FirstOrDefault(t => t.name.Contains("shad"))); - m.SetTexture("_TripleMaskMap", textures.FirstOrDefault(t => t.name.Contains("base"))); - m.SetTexture("_OptionMaskMap", textures.FirstOrDefault(t => t.name.Contains("ctrl"))); - if (CurrentUMAContainer.IsMob) - { - SetMaskColor(m, CurrentUMAContainer.MobHeadColor, "tail", true); - } - } - } - } - - private void LoadProp(GameObject go, Transform SetParent = null) - { - var container = CurrentOtherContainer; - var prop = Instantiate(go, SetParent ? SetParent : container.transform); - - /* - foreach (Renderer r in prop.GetComponentsInChildren()) - { - foreach (Material m in r.sharedMaterials) - { - //Shaders can be differentiated by checking m.shader.name - m.shader = Shader.Find("Unlit/Transparent Cutout"); - } - } - */ - } - public void LoadAssetPath(string path, Transform SetParent) { - RecursiveLoadAsset(UmaViewerMain.Instance.AbList[path], false, SetParent); - } - - private void LoadTear(GameObject go) - { - - if (CurrentUMAContainer) - { - if (go.name.EndsWith("000")) - { - CurrentUMAContainer.TearPrefab_0 = go; - } - else if (go.name.EndsWith("001")) - { - CurrentUMAContainer.TearPrefab_1 = go; - } - } + Instantiate(UmaViewerMain.Instance.AbList[path].Load().Get(), SetParent); } private void LoadFaceMorph(int id, string costumeId) { if (!CurrentUMAContainer.Head) return; + var umaContainer = CurrentUMAContainer as UmaContainerCharacter; var locatorEntry = Main.AbList["3d/animator/drivenkeylocator"]; var bundle = UmaAssetManager.LoadAssetBundle(locatorEntry); - var locator = Instantiate(bundle.LoadAsset("DrivenKeyLocator"), CurrentUMAContainer.transform) as GameObject; + var locator = Instantiate(bundle.LoadAsset("DrivenKeyLocator"), umaContainer.transform) as GameObject; locator.name = "DrivenKeyLocator"; - var headBone = (GameObject)CurrentUMAContainer.Head.GetComponent()._assetTable["head"]; + var headBone = (GameObject)umaContainer.Head.GetComponent()._assetTable["head"]; var eyeLocator_L = headBone.transform.Find("Eye_target_locator_L"); var eyeLocator_R = headBone.transform.Find("Eye_target_locator_R"); @@ -1396,7 +876,7 @@ public class UmaViewerBuilder : MonoBehaviour var leftObj = Instantiate(obj, eyeLocator_L.transform); new List(leftObj.GetComponentsInChildren()).ForEach(a => a.material.renderQueue = -1); - CurrentUMAContainer.LeftMangaObject.Add(leftObj); + umaContainer.LeftMangaObject.Add(leftObj); var RightObj = Instantiate(obj, eyeLocator_R.transform); if (RightObj.TryGetComponent(out var holder)) @@ -1405,7 +885,7 @@ public class UmaViewerBuilder : MonoBehaviour RightObj.transform.localScale = new Vector3(-1, 1, 1); } new List(RightObj.GetComponentsInChildren()).ForEach(a => { a.material.renderQueue = -1; }); - CurrentUMAContainer.RightMangaObject.Add(RightObj); + umaContainer.RightMangaObject.Add(RightObj); }); var tearEntry = new List() { @@ -1415,310 +895,41 @@ public class UmaViewerBuilder : MonoBehaviour if (tearEntry.Count > 0) { - tearEntry.ForEach(a => RecursiveLoadAsset(a)); + tearEntry.ForEach(a => umaContainer.LoadTear(a)); } - if (CurrentUMAContainer.TearPrefab_0 && CurrentUMAContainer.TearPrefab_1) + if (umaContainer.TearPrefab_0 && umaContainer.TearPrefab_1) { - var p0 = CurrentUMAContainer.TearPrefab_0; - var p1 = CurrentUMAContainer.TearPrefab_1; + var p0 = umaContainer.TearPrefab_0; + var p1 = umaContainer.TearPrefab_1; var t = headBone.transform; - CurrentUMAContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 0, 1)); - CurrentUMAContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 1, 1)); - CurrentUMAContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 0, 0)); - CurrentUMAContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 1, 0)); + umaContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 0, 1)); + umaContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 1, 1)); + umaContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 0, 0)); + umaContainer.TearControllers.Add(new TearController(t, Instantiate(p0, t), Instantiate(p1, t), 1, 0)); } - var firsehead = CurrentUMAContainer.Head; + var firsehead = umaContainer.Head; var faceDriven = Instantiate(firsehead.GetComponent()._assetTable["facial_target"]) as FaceDrivenKeyTarget; var earDriven = firsehead.GetComponent()._assetTable["ear_target"] as DrivenKeyTarget; var faceOverride = firsehead.GetComponent()._assetTable["face_override"] as FaceOverrideData; faceDriven._earTarget = earDriven._targetFaces; - CurrentUMAContainer.FaceDrivenKeyTarget = faceDriven; - CurrentUMAContainer.FaceDrivenKeyTarget.Container = CurrentUMAContainer; - CurrentUMAContainer.FaceOverrideData = faceOverride; + umaContainer.FaceDrivenKeyTarget = faceDriven; + umaContainer.FaceDrivenKeyTarget.Container = umaContainer; + umaContainer.FaceOverrideData = faceOverride; faceOverride?.SetEnable(UI.EnableFaceOverride); faceDriven.DrivenKeyLocator = locator.transform; faceDriven.Initialize(UmaUtility.ConvertArrayToDictionary(firsehead.GetComponentsInChildren())); var emotionDriven = ScriptableObject.CreateInstance(); emotionDriven.name = $"char{id}_{costumeId}_emotion_target"; - CurrentUMAContainer.FaceEmotionKeyTarget = emotionDriven; + umaContainer.FaceEmotionKeyTarget = emotionDriven; emotionDriven.FaceDrivenKeyTarget = faceDriven; emotionDriven.FaceEmotionKey = UmaDatabaseController.Instance.FaceTypeData; emotionDriven.Initialize(); } - private void LoadAnimation(AnimationClip clip) - { - if (clip.name.EndsWith("_s")) - { - CurrentUMAContainer.OverrideController["clip_s"] = clip; - } - else if (clip.name.EndsWith("_e")) - { - CurrentUMAContainer.OverrideController["clip_e"] = clip; - } - else if (clip.name.Contains("tail")) - { - if (CurrentUMAContainer.IsMini) return; - CurrentUMAContainer.UpBodyReset(); - CurrentUMAContainer.OverrideController["clip_t"] = clip; - CurrentUMAContainer.UmaAnimator.Play("motion_t", 1, 0); - } - else if (clip.name.EndsWith("_face")) - { - if (CurrentUMAContainer.IsMini) return; - LoadFaceAnimation(clip); - } - else if (clip.name.EndsWith("_ear")) - { - if (CurrentUMAContainer.IsMini) return; - LoadEarAnimation(clip); - } - else if (clip.name.EndsWith("_pos")) - { - if (CurrentUMAContainer.IsMini) return; - CurrentUMAContainer.OverrideController["clip_p"] = clip; - CurrentUMAContainer.UmaAnimator.Play("motion_1", 2, 0); - } - else if (clip.name.EndsWith("_cam")) - { - SetPreviewCamera(clip); - } - else if (clip.name.Contains("_loop")) - { - CurrentUMAContainer.UpBodyReset(); - if (CurrentUMAContainer.isAnimatorControl && CurrentUMAContainer.FaceDrivenKeyTarget) - { - CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); - CurrentUMAContainer.isAnimatorControl = false; - } - - if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/facial")}_face", out UmaDatabaseEntry entry)) - { - RecursiveLoadAsset(entry); - } - - if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/facial")}_ear", out entry)) - { - RecursiveLoadAsset(entry); - } - - UmaDatabaseEntry motion_e = null, motion_s = null; - if (Main.AbList.TryGetValue(clip.name.Replace("_loop", "_s"), out motion_s)) - { - RecursiveLoadAsset(motion_s); - } - - if (CurrentUMAContainer.OverrideController["clip_2"].name.Contains("_loop")) - { - if (!CurrentUMAContainer.OverrideController["clip_2"].name.Contains("hom_"))//home end animation not for interpolation - { - if (Main.AbList.TryGetValue(CurrentUMAContainer.OverrideController["clip_2"].name.Replace("_loop", "_e"), out motion_e)) - { - RecursiveLoadAsset(motion_e); - } - } - } - - SetPreviewCamera(null); - CurrentUMAContainer.OverrideController["clip_1"] = CurrentUMAContainer.OverrideController["clip_2"]; - CurrentUMAContainer.OverrideController["clip_2"] = clip; - CurrentUMAContainer.UmaAnimator.Play("motion_1", -1, 0); - CurrentUMAContainer.UmaAnimator.SetTrigger((motion_s != null && motion_e != null) ? "next_e" : ((motion_s != null) ? "next_s" : "next")); - } - else - { - if (CurrentUMAContainer.FaceDrivenKeyTarget) - { - CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); - CurrentUMAContainer.isAnimatorControl = false; - } - CurrentUMAContainer.UpBodyReset(); - CurrentUMAContainer.UmaAnimator.Rebind(); - CurrentUMAContainer.OverrideController["clip_2"] = clip; - // If Cut-in, play immediately without state interpolation - if (clip.name.Contains("crd") || clip.name.Contains("res_chr")) - { - if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/facial")}_face", out UmaDatabaseEntry facialMotion)) - { - RecursiveLoadAsset(facialMotion); - } - - if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/facial")}_ear", out UmaDatabaseEntry earMotion)) - { - RecursiveLoadAsset(earMotion); - } - - if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/camera")}_cam", out UmaDatabaseEntry cameraMotion)) - { - RecursiveLoadAsset(cameraMotion); - } - - if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/position")}_pos", out UmaDatabaseEntry posMotion)) - { - RecursiveLoadAsset(posMotion); - } - - if (CurrentUMAContainer.IsMini) - { - SetPreviewCamera(null); - } - - if (clip.name.Contains("_cti_crd")) - { - var dir = Path.GetDirectoryName(clip.name).Replace("\\","/"); - string[] param = Path.GetFileName(clip.name).Split('_'); - if (param.Length > 4) - { - int index = int.Parse(param[4]); - if (index == 1) - { - var cur = index + 1; - while (true) - { - var nextSearch = $"{dir}/{param[0]}_{param[1]}_{param[2]}_{param[3]}_{ cur.ToString().PadLeft(2, '0')}"; - if (Main.AbList.TryGetValue(nextSearch, out UmaDatabaseEntry result)) - { - UmaAssetManager.LoadAssetBundle(result); - cur++; - } - else break; - } - } - - index++; - var next = $"{dir}/{param[0]}_{param[1]}_{param[2]}_{param[3]}_{ index.ToString().PadLeft(2, '0')}"; - if (Main.AbList.TryGetValue(next, out UmaDatabaseEntry nextMotion)) - { - var aevent = new AnimationEvent - { - time = clip.length * 0.99f, - stringParameter = (nextMotion != null ? nextMotion.Name : null), - functionName = (nextMotion != null ? "SetNextAnimationCut" : "SetEndAnimationCut") - }; - clip.AddEvent(aevent); - } - } - } - - CurrentUMAContainer.UmaAnimator.Play("motion_2", 0, 0); - } - else - { - SetPreviewCamera(null); - - //Some animations have facial animation - if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/facial")}_face", out UmaDatabaseEntry facialMotion)) - { - RecursiveLoadAsset(facialMotion); - } - - if (Main.AbList.TryGetValue($"{clip.name.Replace("/body", "/facial")}_ear", out UmaDatabaseEntry earMotion)) - { - RecursiveLoadAsset(earMotion); - } - - CurrentUMAContainer.UmaAnimator.Play("motion_2", 0, 0); - } - } - } - - public void LoadFaceAnimation(AnimationClip clip) - { - if (clip.name.Contains("_s")) - { - CurrentUMAContainer.FaceOverrideController["clip_s"] = clip; - } - else if (clip.name.Contains("_e")) - { - CurrentUMAContainer.FaceOverrideController["clip_e"] = clip; - } - else if (clip.name.Contains("_loop")) - { - CurrentUMAContainer.isAnimatorControl = true; - CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); - UmaDatabaseEntry motion_e = null; - UmaDatabaseEntry motion_s = null; - if (Main.AbList.TryGetValue(clip.name.Replace("_loop", "_s"), out motion_s)) - { - RecursiveLoadAsset(motion_s); - } - - if (CurrentUMAContainer.FaceOverrideController["clip_2"].name.Contains("_loop")) - { - if (!CurrentUMAContainer.FaceOverrideController["clip_2"].name.Contains("hom_"))//home end animation not for interpolation - { - if (Main.AbList.TryGetValue(CurrentUMAContainer.FaceOverrideController["clip_2"].name.Replace("_loop", "_e"), out motion_e)) - { - RecursiveLoadAsset(motion_e); - } - } - } - - CurrentUMAContainer.FaceOverrideController["clip_1"] = CurrentUMAContainer.FaceOverrideController["clip_2"]; - CurrentUMAContainer.FaceOverrideController["clip_2"] = clip; - CurrentUMAContainer.UmaFaceAnimator.Play("motion_1", 0, 0); - CurrentUMAContainer.UmaFaceAnimator.SetTrigger((motion_s != null && motion_e != null) ? "next_e" : ((motion_s != null) ? "next_s" : "next")); - } - else - { - CurrentUMAContainer.isAnimatorControl = true; - CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); - CurrentUMAContainer.FaceOverrideController["clip_2"] = clip; - CurrentUMAContainer.UmaFaceAnimator.Play("motion_2", 0, 0); - } - } - - public void LoadEarAnimation(AnimationClip clip) - { - if (clip.name.Contains("_s")) - { - CurrentUMAContainer.FaceOverrideController["clip_s_ear"] = clip; - } - else if (clip.name.Contains("_e")) - { - CurrentUMAContainer.FaceOverrideController["clip_e_ear"] = clip; - } - else if (clip.name.Contains("_loop")) - { - UmaDatabaseEntry motion_e = null; - UmaDatabaseEntry motion_s = null; - if (Main.AbList.TryGetValue(clip.name.Replace("_loop", "_s"), out motion_s)) - { - RecursiveLoadAsset(motion_s); - } - - if (CurrentUMAContainer.FaceOverrideController["clip_2_ear"].name.Contains("_loop")) - { - if (!CurrentUMAContainer.FaceOverrideController["clip_2_ear"].name.Contains("hom_"))//home end animation not for interpolation - { - if (Main.AbList.TryGetValue(CurrentUMAContainer.FaceOverrideController["clip_2_ear"].name.Replace("_loop", "_e"), out motion_e)) - { - RecursiveLoadAsset(motion_e); - } - } - } - - CurrentUMAContainer.FaceOverrideController["clip_1_ear"] = CurrentUMAContainer.FaceOverrideController["clip_2_ear"]; - CurrentUMAContainer.FaceOverrideController["clip_2_ear"] = clip; - CurrentUMAContainer.UmaFaceAnimator.Play("motion_1", 1, 0); - CurrentUMAContainer.UmaFaceAnimator.SetTrigger((motion_s != null && motion_e != null) ? "next_e_ear" : ((motion_s != null) ? "next_s_ear" : "next_ear")); - } - else - { - if (CurrentUMAContainer.FaceOverrideController["clip_2"].name == "clip_2") - { - CurrentUMAContainer.isAnimatorControl = true; - CurrentUMAContainer.FaceDrivenKeyTarget.ResetLocator(); - } - CurrentUMAContainer.FaceOverrideController["clip_2_ear"] = clip; - CurrentUMAContainer.UmaFaceAnimator.Play("motion_2", 1, 0); - } - } - public void SetPreviewCamera(AnimationClip clip) { if (clip) @@ -1856,89 +1067,6 @@ public class UmaViewerBuilder : MonoBehaviour } } - private void SetMaskColor(Material mat, DataRow colordata, bool IsMob) - { - mat.EnableKeyword("USE_MASK_COLOR"); - Color c1, c2, c3, c4, c5, c6, t1, t2, t3, t4, t5, t6; - if (IsMob) - { - ColorUtility.TryParseHtmlString(colordata["color_r1"].ToString(), out c1); - ColorUtility.TryParseHtmlString(colordata["color_r2"].ToString(), out c2); - ColorUtility.TryParseHtmlString(colordata["color_g1"].ToString(), out c3); - ColorUtility.TryParseHtmlString(colordata["color_g2"].ToString(), out c4); - ColorUtility.TryParseHtmlString(colordata["color_b1"].ToString(), out c5); - ColorUtility.TryParseHtmlString(colordata["color_b2"].ToString(), out c6); - ColorUtility.TryParseHtmlString(colordata["toon_color_r1"].ToString(), out t1); - ColorUtility.TryParseHtmlString(colordata["toon_color_r2"].ToString(), out t2); - ColorUtility.TryParseHtmlString(colordata["toon_color_g1"].ToString(), out t3); - ColorUtility.TryParseHtmlString(colordata["toon_color_g2"].ToString(), out t4); - ColorUtility.TryParseHtmlString(colordata["toon_color_b1"].ToString(), out t5); - ColorUtility.TryParseHtmlString(colordata["toon_color_b2"].ToString(), out t6); - } - else - { - ColorUtility.TryParseHtmlString("#" + colordata["image_color_main"].ToString(), out c1); - ColorUtility.TryParseHtmlString("#" + colordata["image_color_sub"].ToString(), out c2); - ColorUtility.TryParseHtmlString("#" + colordata["ui_color_sub"].ToString(), out c3); - ColorUtility.TryParseHtmlString("#" + colordata["ui_color_sub"].ToString(), out c4); - ColorUtility.TryParseHtmlString("#" + colordata["ui_training_color_1"].ToString(), out c5); - ColorUtility.TryParseHtmlString("#" + colordata["ui_training_color_2"].ToString(), out c6); - float toonstrength = 0.8f; - t1 = c1 * toonstrength; - t2 = c2 * toonstrength; - t3 = c3 * toonstrength; - t4 = c4 * toonstrength; - t5 = c5 * toonstrength; - t6 = c6 * toonstrength; - } - - mat.SetColor("_MaskColorR1", c1); - mat.SetColor("_MaskColorR2", c2); - mat.SetColor("_MaskColorG1", c3); - mat.SetColor("_MaskColorG2", c4); - mat.SetColor("_MaskColorB1", c5); - mat.SetColor("_MaskColorB2", c6); - mat.SetColor("_MaskToonColorR1", t1); - mat.SetColor("_MaskToonColorR2", t2); - mat.SetColor("_MaskToonColorG1", t3); - mat.SetColor("_MaskToonColorG2", t4); - mat.SetColor("_MaskToonColorB1", t5); - mat.SetColor("_MaskToonColorB2", t6); - } - - private void SetMaskColor(Material mat, DataRow colordata, string prefix, bool hastoon) - { - mat.EnableKeyword("USE_MASK_COLOR"); - Color c1, c2, c3, c4, c5, c6, t1, t2, t3, t4, t5, t6; - ColorUtility.TryParseHtmlString(colordata[$"{prefix}_color_r1"].ToString(), out c1); - ColorUtility.TryParseHtmlString(colordata[$"{prefix}_color_r2"].ToString(), out c2); - ColorUtility.TryParseHtmlString(colordata[$"{prefix}_color_g1"].ToString(), out c3); - ColorUtility.TryParseHtmlString(colordata[$"{prefix}_color_g2"].ToString(), out c4); - ColorUtility.TryParseHtmlString(colordata[$"{prefix}_color_b1"].ToString(), out c5); - ColorUtility.TryParseHtmlString(colordata[$"{prefix}_color_b2"].ToString(), out c6); - mat.SetColor("_MaskColorR1", c1); - mat.SetColor("_MaskColorR2", c2); - mat.SetColor("_MaskColorG1", c3); - mat.SetColor("_MaskColorG2", c4); - mat.SetColor("_MaskColorB1", c5); - mat.SetColor("_MaskColorB2", c6); - if (hastoon) - { - ColorUtility.TryParseHtmlString(colordata[$"{prefix}_toon_color_r1"].ToString(), out t1); - ColorUtility.TryParseHtmlString(colordata[$"{prefix}_toon_color_r2"].ToString(), out t2); - ColorUtility.TryParseHtmlString(colordata[$"{prefix}_toon_color_g1"].ToString(), out t3); - ColorUtility.TryParseHtmlString(colordata[$"{prefix}_toon_color_g2"].ToString(), out t4); - ColorUtility.TryParseHtmlString(colordata[$"{prefix}_toon_color_b1"].ToString(), out t5); - ColorUtility.TryParseHtmlString(colordata[$"{prefix}_toon_color_b2"].ToString(), out t6); - mat.SetColor("_MaskToonColorR1", t1); - mat.SetColor("_MaskToonColorR2", t2); - mat.SetColor("_MaskToonColorG1", t3); - mat.SetColor("_MaskToonColorG2", t4); - mat.SetColor("_MaskToonColorB1", t5); - mat.SetColor("_MaskToonColorB2", t6); - } - } - public void UnloadAllBundle() => UmaAssetManager.UnloadAllBundle(true); private void FixedUpdate() diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index 4074c56..2fd97dd 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -837,7 +837,7 @@ public class UmaViewerUI : MonoBehaviour pageentry.OnClick = (container) => { HighlightChildImage(animationList.content, container); - Builder.LoadAsset(entry); + (Builder.CurrentUMAContainer as UmaContainerCharacter)?.LoadAnimation(entry); LoadedAnimation(); }; pageentrys.Add(pageentry); @@ -848,16 +848,7 @@ public class UmaViewerUI : MonoBehaviour { foreach (var entry in filteredList.Where(a => a.Name.Contains($"/tail"))) { - var entryInstance = entry; - var container = Instantiate(UmaContainerPrefab, animationList.content).GetComponent(); - container.Name = container.name = Path.GetFileName(entry.Name); - container.FontSize = 20; - container.Button.onClick.AddListener(() => - { - HighlightChildImage(animationList.content, container); - Builder.LoadAsset(entryInstance); - LoadedAnimation(); - }); + CreateAnimationSelectionPanel(entry, animationList.content); } pageManager.ResetCtrl(); } @@ -865,16 +856,7 @@ public class UmaViewerUI : MonoBehaviour { foreach (var entry in Main.AbMotions.Where(a => a.Name.Contains($"type00_ear") && !a.Name.EndsWith("driven") && !a.Name.Contains("touch"))) { - var entryInstance = entry; - var container = Instantiate(UmaContainerPrefab, animationList.content).GetComponent(); - container.Name = container.name = Path.GetFileName(entry.Name); - container.FontSize = 20; - container.Button.onClick.AddListener(() => - { - HighlightChildImage(animationList.content, container); - Builder.LoadAsset(entryInstance); - LoadedAnimation(); - }); + CreateAnimationSelectionPanel(entry, animationList.content); } pageManager.ResetCtrl(); } @@ -883,36 +865,31 @@ public class UmaViewerUI : MonoBehaviour //Common animations foreach (var entry in filteredList.Where(a => a.Name.Contains($"chara/chr{umaId}") && !a.Name.Contains("pose"))) { - var entryInstance = entry; - var container = Instantiate(UmaContainerPrefab, animationList.content).GetComponent(); - container.Name = container.name = Path.GetFileName(entry.Name); - container.FontSize = 20; - container.Button.onClick.AddListener(() => - { - HighlightChildImage(animationList.content, container); - Builder.LoadAsset(entryInstance); - LoadedAnimation(); - }); + CreateAnimationSelectionPanel(entry, animationList.content); } //Skill animations foreach (var entry in filteredList.Where(a => a.Name.Contains($"card/body/crd{umaId}"))) { - var entryInstance = entry; - var container = Instantiate(UmaContainerPrefab, animationList.content).GetComponent(); - container.Name = container.name = Path.GetFileName(entry.Name); - container.FontSize = 20; - container.Button.onClick.AddListener(() => - { - HighlightChildImage(animationList.content, container); - Builder.LoadAsset(entryInstance); - LoadedAnimation(); - }); + CreateAnimationSelectionPanel(entry, animationList.content); } pageManager.ResetCtrl(); } } + void CreateAnimationSelectionPanel(UmaDatabaseEntry entry, Transform parent) + { + var container = Instantiate(UmaContainerPrefab, parent).GetComponent(); + container.Name = container.name = Path.GetFileName(entry.Name); + container.FontSize = 20; + container.Button.onClick.AddListener(() => + { + HighlightChildImage(parent, container); + (Builder.CurrentUMAContainer as UmaContainerCharacter)?.LoadAnimation(entry); + LoadedAnimation(); + }); + } + void ListBackgrounds() { var pageentrys = new List();