bug fix
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user