fix materials

This commit is contained in:
Mister_Nebula 2022-02-03 11:55:41 +00:00
parent 34e67dad6d
commit 7e20565a2c
4 changed files with 9 additions and 14 deletions

Binary file not shown.

Binary file not shown.

View File

@ -1,9 +1,9 @@
ManifestFileVersion: 0
CRC: 2877256378
CRC: 3330178405
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 8d7ea522fab30919b9da9d6fcc291d2b
Hash: 6448c1621c3b69c6bd03c9af8f62076e
TypeTreeHash:
serializedVersion: 2
Hash: 7c361b9660415c98c90cf08b6645985a
@ -101,7 +101,6 @@ ClassTypes:
Script: {instanceID: 0}
SerializeReferenceClassIdentifiers: []
Assets:
- Assets/Prefabs/NetworkObject.prefab
- Assets/GameAssets/AnimatorController/Player.controller
- Assets/Prefabs/NETWORK_Player_Body.prefab
- Assets/Prefabs/REMOTE_Player_Body.prefab

View File

@ -22,7 +22,7 @@ namespace QSB.PlayerBodySetup.Remote
{
for (var i = 0; i < renderer.materials.Length; i++)
{
if (renderer.materials[i].name.Trim() == $"{materialName} (Instance)")
if (renderer.materials[i].name.Trim() == $"REM_{materialName} (Instance)")
{
ReplaceMaterial(renderer, i, replacementMaterial);
}
@ -36,21 +36,17 @@ namespace QSB.PlayerBodySetup.Remote
"Traveller_HEA_Player_Skin_mat",
"Traveller_HEA_Player_Clothes_mat",
"Traveller_HEA_PlayerSuit_mat",
"Props_HEA_Jetpack_mat"
"Props_HEA_Jetpack_mat",
"Effects_HEA_MarshmallowFlames_mat",
"Effects_HEA_Smoke_mat",
"Props_HEA_RoastingStick_mat"
};
var allMaterials = (Material[])Resources.FindObjectsOfTypeAll(typeof(Material));
foreach (var name in matNameList)
{
DebugLog.DebugWrite(name);
var matchingMaterial = allMaterials.Where(x => x.name == name).ToArray();
foreach (var item in matchingMaterial)
{
DebugLog.DebugWrite($"- {item.name}");
}
var matchingMaterial = allMaterials.FirstOrDefault(x => x.name == name);
if (matchingMaterial == default)
{
@ -58,7 +54,7 @@ namespace QSB.PlayerBodySetup.Remote
return;
}
_materialDefinitions.Add(new(name, matchingMaterial[0]));
_materialDefinitions.Add(new(name, matchingMaterial));
}
}