Merged changed from Croakfang's branch. (#72)

* merge (#71)

* Bug fix, improved UI layout and live vocals

* Bug Fixes, New Live Compatibility

---------

Co-authored-by: CroakFang <1605296300@qq.com>

* recovered shader functions

* Fixed texture loading for costume 0015

---------

Co-authored-by: CroakFang <1605296300@qq.com>
This commit is contained in:
katboi01
2024-09-09 10:27:37 +02:00
committed by GitHub
parent 4292484f25
commit 3b2bae40cd
23 changed files with 916 additions and 617 deletions
+8 -14
View File
@@ -160,9 +160,9 @@ public class UmaContainerCharacter : UmaContainer
//Materials
foreach (var rend in gameObject.GetComponentsInChildren<Renderer>())
{
for (int i = 0; i < rend.sharedMaterials.Length; i++)
for (int i = 0; i < rend.materials.Length; i++)
{
Material mat = rend.sharedMaterials[i];
Material mat = rend.materials[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.sharedMaterials)
foreach (Material m in r.materials)
{
string mainTex = "", toonMap = "", tripleMap = "", optionMap = "", zekkenNumberTex = "";
@@ -615,7 +615,7 @@ public class UmaContainerCharacter : UmaContainer
switch (costumeIdShort.Split('_')[0]) //costume ID
{
case "0001":
switch (r.sharedMaterials.ToList().IndexOf(m))
switch (r.materials.ToList().IndexOf(m))
{
case 0:
mainTex = $"tex_bdy{costumeIdShort}_00_waku0_diff";
@@ -646,13 +646,7 @@ public class UmaContainerCharacter : UmaContainer
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":
case "0006": case "0009": case "0015":
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";
@@ -681,7 +675,7 @@ public class UmaContainerCharacter : UmaContainer
{
foreach (Renderer r in Body.GetComponentsInChildren<Renderer>())
{
foreach (Material m in r.sharedMaterials)
foreach (Material m in r.materials)
{
//BodyAlapha's shader need to change manually.
if (m.name.Contains("bdy") && m.name.Contains("Alpha"))
@@ -721,7 +715,7 @@ public class UmaContainerCharacter : UmaContainer
foreach (Renderer r in head.GetComponentsInChildren<Renderer>())
{
foreach (Material m in r.sharedMaterials)
foreach (Material m in r.materials)
{
if (head.name.Contains("mchr"))
{
@@ -866,7 +860,7 @@ public class UmaContainerCharacter : UmaContainer
var textures = MobHeadTextures;
foreach (Renderer r in hair.GetComponentsInChildren<Renderer>())
{
foreach (Material m in r.sharedMaterials)
foreach (Material m in r.materials)
{
//Glasses's shader need to change manually.