diff --git a/Assets/Scripts/UmaContainerCharacter.cs b/Assets/Scripts/UmaContainerCharacter.cs index 734f96f..39a9fee 100644 --- a/Assets/Scripts/UmaContainerCharacter.cs +++ b/Assets/Scripts/UmaContainerCharacter.cs @@ -160,9 +160,9 @@ public class UmaContainerCharacter : UmaContainer //Materials foreach (var rend in gameObject.GetComponentsInChildren()) { - for (int i = 0; i < rend.materials.Length; i++) + for (int i = 0; i < rend.sharedMaterials.Length; i++) { - Material mat = rend.materials[i]; + Material mat = rend.sharedMaterials[i]; var matHlp = Materials.FirstOrDefault(m => m.Mat == mat); if (matHlp == null) @@ -572,7 +572,7 @@ public class UmaContainerCharacter : UmaContainer foreach (Renderer r in Body.GetComponentsInChildren()) { - foreach (Material m in r.materials) + foreach (Material m in r.sharedMaterials) { string mainTex = "", toonMap = "", tripleMap = "", optionMap = "", zekkenNumberTex = ""; @@ -615,7 +615,7 @@ public class UmaContainerCharacter : UmaContainer switch (costumeIdShort.Split('_')[0]) //costume ID { case "0001": - switch (r.materials.ToList().IndexOf(m)) + switch (r.sharedMaterials.ToList().IndexOf(m)) { case 0: mainTex = $"tex_bdy{costumeIdShort}_00_waku0_diff"; @@ -675,7 +675,7 @@ public class UmaContainerCharacter : UmaContainer { foreach (Renderer r in Body.GetComponentsInChildren()) { - foreach (Material m in r.materials) + foreach (Material m in r.sharedMaterials) { //BodyAlapha's shader need to change manually. if (m.name.Contains("bdy") && m.name.Contains("Alpha")) @@ -715,7 +715,7 @@ public class UmaContainerCharacter : UmaContainer foreach (Renderer r in head.GetComponentsInChildren()) { - foreach (Material m in r.materials) + foreach (Material m in r.sharedMaterials) { if (head.name.Contains("mchr")) { @@ -860,7 +860,7 @@ public class UmaContainerCharacter : UmaContainer var textures = MobHeadTextures; foreach (Renderer r in hair.GetComponentsInChildren()) { - foreach (Material m in r.materials) + foreach (Material m in r.sharedMaterials) { //Glasses's shader need to change manually. @@ -906,7 +906,7 @@ public class UmaContainerCharacter : UmaContainer var textures = TailTextures; foreach (Renderer r in Tail.GetComponentsInChildren()) { - foreach (Material m in r.materials) + 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"))); diff --git a/Assets/Scripts/UmaViewerUI.cs b/Assets/Scripts/UmaViewerUI.cs index f8b61dc..07c801f 100644 --- a/Assets/Scripts/UmaViewerUI.cs +++ b/Assets/Scripts/UmaViewerUI.cs @@ -747,7 +747,9 @@ public class UmaViewerUI : MonoBehaviour foreach (var entry in Main.AbChara.Where(a => a.Name.Contains("/body/") && !a.Name.Contains("/clothes/") && a.Name.Contains(nameVar))) { string id = Path.GetFileName(entry.Name); - id = id.Split('_')[1].Substring(mini ? 4 : 3) + "_" + id.Split('_')[2] + "_" + id.Split('_')[3]; + string[] split = id.Split('_'); + if (split.Length < 4) continue; //prevents error for mini umas + id = split[1].Substring(mini ? 4 : 3) + "_" + split[2] + "_" + split[3]; if (!costumes.Contains(id)) { costumes.Add(id); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6c56aab..6db369e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 2.1.13 + bundleVersion: 2.1.14 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0