Fixed head textures not loading for mob umas

Fixed error when loading the list of mini uma costumes
This commit is contained in:
katboi01
2024-11-06 12:51:29 +01:00
parent 3e2a9704a8
commit 44e33274c5
3 changed files with 12 additions and 10 deletions
+8 -8
View File
@@ -160,9 +160,9 @@ public class UmaContainerCharacter : UmaContainer
//Materials
foreach (var rend in gameObject.GetComponentsInChildren<Renderer>())
{
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<Renderer>())
{
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<Renderer>())
{
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<Renderer>())
{
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<Renderer>())
{
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<Renderer>())
{
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")));
+3 -1
View File
@@ -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);