Skip to content

Commit

Permalink
fix: error
Browse files Browse the repository at this point in the history
  • Loading branch information
@lilxyzw
lilxyzw committed Apr 7, 2024
1 parent fc29a48 commit 97e6b19
Show file tree
Hide file tree
Showing 50 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion Assets/lilToon/CustomShaderResources/Properties/Default.lilblock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Editor/lilInspector.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2656,7 +2656,7 @@ private void DrawAdvancedGUI(Material material)
{
if(ShouldDrawBlock(PropertyBlock.RimShade))
{
edSet.isShowRimShade = lilEditorGUI.Foldout(GetLoc("sRimShade"), edSet.isShowRimShade);
edSet.isShowRimShade = lilEditorGUI.Foldout("RimShade", edSet.isShowRimShade);
DrawMenuButton(GetLoc("sAnchorRimShade"), PropertyBlock.RimShade);
if(edSet.isShowRimShade)
{
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Editor/lilMaterialUtils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ public static void SetupMultiMaterial(Material material)

public static void SetupMultiMaterial(Material[] materials, AnimationClip[] clips)
{
var ms = materials.Where(m => new lilToonInspector.MaterialType(m, false).isMulti).ToArray();
var ms = materials.Where(m => m.shader.name.Contains("Multi")).ToArray();
foreach(var binding in clips.SelectMany(c => AnimationUtility.GetCurveBindings(c)).ToArray())
{
string propname = binding.propertyName;
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "lilToon"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_cutout.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonCutout"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_cutout_o.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonCutoutOutline"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_cutout_oo.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonOutlineOnlyCutout"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_fur.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonFur"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_fur_cutout.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonFurCutout"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_fur_two.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonFurTwoPass"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_furonly.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonFurOnlyTransparent"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_furonly_cutout.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonFurOnlyCutout"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_furonly_two.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonFurOnlyTwoPass"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_gem.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonGem"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_o.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonOutline"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_onetrans.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonOnePassTransparent"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_onetrans_o.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonOnePassTransparentOutline"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_oo.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonOutlineOnly"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_overlay.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonOverlay"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_overlay_one.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "_lil/[Optional] lilToonOverlayOnePass"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_ref.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonRefraction"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_ref_blur.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonRefractionBlur"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_tess.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellation"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_tess_cutout.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationCutout"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_tess_cutout_o.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationCutoutOutline"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_tess_o.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationOutline"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_tess_onetrans.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationOnePassTransparent"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_tess_onetrans_o.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationOnePassTransparentOutline"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_tess_trans.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationTransparent"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_tess_trans_o.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationTransparentOutline"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
2 changes: 1 addition & 1 deletion Assets/lilToon/Shader/lts_tess_twotrans.shader
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Shader "Hidden/lilToonTessellationTwoPassTransparent"

//----------------------------------------------------------------------------------------------------------------------
// Rim Shade
[lilToggleLeft] _UseRimShade ("sRimShade", Int) = 0
[lilToggleLeft] _UseRimShade ("RimShade", Int) = 0
_RimShadeColor ("sColor", Color) = (0.5,0.5,0.5,1.0)
[NoScaleOffset] _RimShadeMask ("Mask", 2D) = "white" {}
_RimShadeNormalStrength ("sNormalStrength", Range(0, 1)) = 1.0
Expand Down
Loading

0 comments on commit 97e6b19

Please sign in to comment.