From e23599a80d761c8a9089c6317a61d1dad2eba2e6 Mon Sep 17 00:00:00 2001 From: CroakFang <1605296300@qq.com> Date: Sun, 26 Feb 2023 19:51:28 +0800 Subject: [PATCH] bug fix --- Assets/Editor/GlobalValue.cs | 3 +++ Assets/Scripts/UmaViewerGlobalShader.cs | 3 ++- Assets/Scripts/umamusume/Gallop/CharaShaderEffectData.cs | 4 ++-- Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs | 3 --- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Assets/Editor/GlobalValue.cs b/Assets/Editor/GlobalValue.cs index 1bb504d..0bf7e05 100644 --- a/Assets/Editor/GlobalValue.cs +++ b/Assets/Editor/GlobalValue.cs @@ -51,6 +51,7 @@ public class GlobalValue : EditorWindow Vector4 _Global_FogLength; float _RimHorizonOffset; + float _UVEmissivePower; Color _AmbientColor; @@ -77,6 +78,7 @@ public class GlobalValue : EditorWindow _GlobalCameraFov = EditorGUILayout.Slider("_GlobalCameraFov", _GlobalCameraFov, 0, 100); _CylinderBlend = EditorGUILayout.Slider("_CylinderBlend", _CylinderBlend, 0, 100); _RimHorizonOffset = EditorGUILayout.Slider("_RimHorizonOffset", _RimHorizonOffset, 0, 1); + _UVEmissivePower = EditorGUILayout.Slider("_UVEmissivePower", _UVEmissivePower, 0, 10); //Color _GlobalToonColor = EditorGUILayout.ColorField("ÒõÓ°ÑÕÉ«", _GlobalToonColor); _Global_FogColor = EditorGUILayout.ColorField("_Global_FogColor", _Global_FogColor); @@ -136,6 +138,7 @@ public class GlobalValue : EditorWindow Shader.SetGlobalFloat("_GlobalCameraFov", _GlobalCameraFov); Shader.SetGlobalFloat("_CylinderBlend", _CylinderBlend); Shader.SetGlobalFloat("_RimHorizonOffset", _RimHorizonOffset); + Shader.SetGlobalFloat("_UVEmissivePower", _UVEmissivePower); //Vector Array _MainParam.Clear(); _MainParam.Add(_MainParam_0); diff --git a/Assets/Scripts/UmaViewerGlobalShader.cs b/Assets/Scripts/UmaViewerGlobalShader.cs index 49af4d0..7af6195 100644 --- a/Assets/Scripts/UmaViewerGlobalShader.cs +++ b/Assets/Scripts/UmaViewerGlobalShader.cs @@ -50,7 +50,7 @@ public class UmaViewerGlobalShader : MonoBehaviour public Vector4 _Global_FogLength; public float _RimHorizonOffset; - + public float _UVEmissivePower; public Color _AmbientColor; public Vector2 scrollPosition = Vector2.zero; @@ -74,6 +74,7 @@ public class UmaViewerGlobalShader : MonoBehaviour Shader.SetGlobalFloat("_GlobalCameraFov", _GlobalCameraFov); Shader.SetGlobalFloat("_CylinderBlend", _CylinderBlend); Shader.SetGlobalFloat("_RimHorizonOffset", _RimHorizonOffset); + Shader.SetGlobalFloat("_UVEmissivePower", _UVEmissivePower); //Vector Array _MainParam.Clear(); _MainParam.Add(_MainParam_0); diff --git a/Assets/Scripts/umamusume/Gallop/CharaShaderEffectData.cs b/Assets/Scripts/umamusume/Gallop/CharaShaderEffectData.cs index 88d321e..f996419 100644 --- a/Assets/Scripts/umamusume/Gallop/CharaShaderEffectData.cs +++ b/Assets/Scripts/umamusume/Gallop/CharaShaderEffectData.cs @@ -34,8 +34,8 @@ namespace Gallop if (settingData.Type == EffectType.UVScrollEmissive) { var p = settingData.ParamArray; - mat.SetVector("_UVEmissiveScroll", new Vector4(p[0], p[1], p[2],p[3])); - mat.SetVector("_UVEmissiveRange", new Vector4(p[4], p[5], p[6], p[7])); + mat.SetVector("_UVEmissiveRange", new Vector4(p[0], p[1], p[2],p[3])); + //mat.SetVector("_UVEmissiveScroll", new Vector4(p[4], p[5], p[6], p[7])); } } } diff --git a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs index 9edf8d2..01d1689 100644 --- a/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs +++ b/Assets/Scripts/umamusume/Gallop/FaceDrivenKeyTarget.cs @@ -593,10 +593,7 @@ namespace Gallop if (morph == null) { GetMorphByType(morphs, data.BaseReplaceFaceType).weight = 1; - Debug.LogError(morph.tag); } - else - Debug.LogError(morph.tag); } foreach (var arr in data.DataArray)