From 9e08a76482bdfec99161cd7d11d61de475efc079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E7=9C=8B?= <1918891542@qq.com> Date: Thu, 29 Sep 2022 02:27:10 +0800 Subject: [PATCH] adjust shader loading for mod test --- Assets/Scripts/UmaViewerBuilder.cs | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index 8488e7f..a7f359b 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -28,6 +28,12 @@ public class UmaViewerBuilder : MonoBehaviour public UmaHeadData CurrentHead; + public Shader hairShader; + public Shader faceShader; + public Shader eyeShader; + public Shader cheekShader; + public Shader eyebrowShader; + public List CurrentAudioSources = new List(); public List CurrentLyrics = new List(); @@ -605,8 +611,19 @@ public class UmaViewerBuilder : MonoBehaviour { if (bundle.name == "shader.a") { - if (Main.ShadersLoaded) return; - else Main.ShadersLoaded = true; + if (Main.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"); + Main.ShadersLoaded = true; + } } foreach (string name in bundle.GetAllAssetNames()) @@ -816,19 +833,25 @@ public class UmaViewerBuilder : MonoBehaviour switch (m.shader.name) { case "Gallop/3D/Chara/MultiplyCheek": + m.shader = cheekShader; m.CopyPropertiesFromMaterial(TransMaterialCharas); 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");