Rename Nyx State to NightSoul

Melioli · Aug 26, 2024 · b913602 · b913602
1 parent d8711f6
commit b913602
Show file tree

Hide file tree

Showing 7 changed files with 372 additions and 4 deletions.
diff --git a/Editor.meta b/Editor.meta
diff --git a/Editor/Manager.meta b/Editor/Manager.meta
diff --git a/Editor/Manager/HoyoToonManager.json b/Editor/Manager/HoyoToonManager.json
@@ -0,0 +1,341 @@
+{
+  "Textures": {
+    "ClampKeyword": ["Dissolve", "ramp", "Star", "_Skin"],
+    "NonSRGBKeywords": [
+      "normalmap",
+      "lightmap",
+      "face_shadow",
+      "face01_shadow",
+      "specular_ramp",
+      "gradient",
+      "Grain",
+      "Dissolve",
+      "Repeat",
+      "Stockings",
+      "ExpressionMap",
+      "FaceMap",
+      "materialidvalueslut",
+      "ColorMask",
+      "_Mask",
+      "_Normal"
+    ],
+    "EndsWithNonSRGBKeywords": [
+      "_HM",
+      "_N",
+      "_HET",
+      "_ID",
+      "_SDF",
+      "_CUBE",
+      "_EG",
+      "_EM",
+      "T_Caustic"
+    ],
+    "NonPower2Keywords": ["materialidvalueslut"]
+  },
+  "Shaders": {
+    "HSRShader": ["HoyoToon/Star Rail/Character"],
+    "GIShader": ["HoyoToon/Genshin/Character"],
+    "Hi3Shader": ["HoyoToon/Honkai Impact/Character Part 1"],
+    "Hi3P2Shader": ["HoyoToon/Honkai Impact/Character Part 2"],
+    "WuWaShader": ["HoyoToon/Wuthering Waves/Character"]
+  },
+  "ShaderKeywords": {
+    "HSRShader": [
+      "_ScreenLineInst",
+      "_DissolveDistortionIntensity",
+      "_DissolveRate"
+    ],
+    "GIShader": ["_UtilityDisplay1", "_DisableCGP", "UseGlassSpecularToggle"],
+    "Hi3Shader": ["_SPCubeMapIntensity"],
+    "Hi3P2Shader": ["_MetalMapGrp", "_MicsGrp"],
+    "WuWaShader": ["ShadingModel"]
+  },
+  "MaterialSettings": {
+    "HoyoToon/Star Rail/Character": {
+      "Face": {
+        "variant_selector": 1,
+        "_BaseMaterial": 0,
+        "_HairMaterial": 0,
+        "_FaceMaterial": 1,
+        "_EyeShadowMat": 0,
+        "_CullMode": 2,
+        "_SrcBlend": 1,
+        "_DstBlend": 0,
+        "_EnableStencil": 1,
+        "_StencilPassA": 0,
+        "_StencilPassB": 2,
+        "_StencilCompA": 5,
+        "_StencilCompB": 5,
+        "_StencilRef": 100,
+        "renderQueue": 2010
+      },
+      "EyeShadow": {
+        "variant_selector": 2,
+        "_BaseMaterial": 0,
+        "_HairMaterial": 0,
+        "_FaceMaterial": 0,
+        "_EyeShadowMat": 1,
+        "_CullMode": 0,
+        "_SrcBlend": 2,
+        "_DstBlend": 0,
+        "_EnableStencil": 0,
+        "_StencilPassA": 0,
+        "_StencilPassB": 2,
+        "_StencilCompA": 0,
+        "_StencilCompB": 8,
+        "_StencilRef": 0,
+        "renderQueue": 2015
+      },
+      "FaceMask": {
+        "variant_selector": 1,
+        "_BaseMaterial": 0,
+        "_HairMaterial": 0,
+        "_FaceMaterial": 1,
+        "_EyeShadowMat": 0,
+        "_CullMode": 0,
+        "_SrcBlend": 1,
+        "_DstBlend": 0,
+        "_EnableStencil": 0,
+        "_StencilPassA": 0,
+        "_StencilPassB": 2,
+        "_StencilCompA": 5,
+        "_StencilCompB": 5,
+        "_StencilRef": 99,
+        "_OutlineWidth": 0,
+        "renderQueue": 2010
+      },
+      "Trans": {
+        "_IsTransparent": 1,
+        "variant_selector": 0,
+        "_BaseMaterial": 1,
+        "_HairMaterial": 0,
+        "_FaceMaterial": 0,
+        "_EyeShadowMat": 0,
+        "_CullMode": 0,
+        "_SrcBlend": 5,
+        "_DstBlend": 10,
+        "_EnableStencil": 0,
+        "_StencilPassA": 2,
+        "_StencilPassB": 0,
+        "_StencilCompA": 0,
+        "_StencilCompB": 0,
+        "_StencilRef": 0,
+        "renderQueue": 2041
+      },
+      "Hair": {
+        "variant_selector": 3,
+        "_BaseMaterial": 0,
+        "_HairMaterial": 1,
+        "_FaceMaterial": 0,
+        "_EyeShadowMat": 0,
+        "_CullMode": 0,
+        "_SrcBlend": 1,
+        "_DstBlend": 0,
+        "_EnableStencil": 1,
+        "_StencilPassA": 0,
+        "_StencilPassB": 0,
+        "_StencilCompA": 5,
+        "_StencilCompB": 8,
+        "_StencilRef": 100,
+        "_UseSelfShadow": 1,
+        "renderQueue": 2020
+      },
+      "Default": {
+        "variant_selector": 0,
+        "_BaseMaterial": 1,
+        "_HairMaterial": 0,
+        "_FaceMaterial": 0,
+        "_EyeShadowMat": 0,
+        "_CullMode": 0,
+        "_SrcBlend": 5,
+        "_DstBlend": 10,
+        "_EnableStencil": 0,
+        "_StencilPassA": 2,
+        "_StencilPassB": 0,
+        "_StencilCompA": 0,
+        "_StencilCompB": 0,
+        "_StencilRef": 0,
+        "_OutlineScale": 0.187,
+        "_RimWidth": 1,
+        "_UseSelfShadow": 1,
+        "renderQueue": 2040
+      }
+    },
+    "HoyoToon/Genshin/Character": {
+      "Face": {
+        "variant_selector": 1,
+        "_UseFaceMapNew": 1,
+        "_UseSelfShadow": 0
+      },
+      "Equip": {
+        "variant_selector": 2,
+        "_UseWeapon": 1
+      },
+      "Glass_Eff": {
+        "_SrcBlend": "_SrcBlendMode",
+        "_DstBlend": "_DstBlendMode",
+        "variant_selector": 3,
+        "_UseWeapon": 1
+      },
+      "Default": {
+        "variant_selector": 0
+      }
+    },
+    "HoyoToon/Honkai Impact/Character Part 1": {
+      "Face": {
+        "variant_selector": 1,
+        "_EnableStencil": 1,
+        "_StencilPassA": 0,
+        "_StencilPassB": 2,
+        "_StencilCompA": 6,
+        "_StencilCompB": 8,
+        "_StencilRef": 16,
+        "renderQueue": 2000
+      },
+      "Hair": {
+        "variant_selector": 2,
+        "_EnableStencil": 1,
+        "_StencilPassA": 0,
+        "_StencilPassB": 2,
+        "_StencilCompA": 6,
+        "_StencilCompB": 8,
+        "_StencilRef": 16,
+        "renderQueue": 2002
+      },
+      "Eye": {
+        "variant_selector": 3,
+        "_EnableStencil": 1,
+        "_StencilPassA": 0,
+        "_StencilPassB": 2,
+        "_StencilCompA": 6,
+        "_StencilCompB": 8,
+        "_StencilRef": 16,
+        "renderQueue": 2001
+      },
+      "Alpha": {
+        "_AlphaType": 1,
+        "_SrcBlend": 5,
+        "_DstBlend": 10,
+        "renderQueue": 2003
+      }
+    },
+    "HoyoToon/Honkai Impact/Character Part 2": {
+      "Face": {
+        "variant_selector": 1,
+        "_EnableStencil": 1,
+        "_StencilPassA": 0,
+        "_StencilPassB": 2,
+        "_StencilCompA": 6,
+        "_StencilCompB": 8,
+        "_StencilRef": 16,
+        "renderQueue": 2000
+      },
+      "Hair": {
+        "variant_selector": 2,
+        "_EnableStencil": 1,
+        "_StencilPassA": 0,
+        "_StencilPassB": 2,
+        "_StencilCompA": 6,
+        "_StencilCompB": 8,
+        "_StencilRef": 16,
+        "renderQueue": 2002
+      },
+      "Eye": {
+        "variant_selector": 3,
+        "_EnableStencil": 1,
+        "_StencilPassA": 0,
+        "_StencilPassB": 2,
+        "_StencilCompA": 6,
+        "_StencilCompB": 8,
+        "_StencilRef": 16,
+        "renderQueue": 2001
+      }
+    },
+    "HoyoToon/Wuthering Waves/Character": {
+      "Bangs": {
+        "_MaterialType": 3,
+        "_SrcBlend": 1,
+        "_DstBlend": 0,
+        "_StencilPassA": 0,
+        "_StencilPassB": 0,
+        "_StencilPassShadow": 0,
+        "_StencilCompA": 5,
+        "_StencilCompB": 8,
+        "_StencilCompShadow": 5,
+        "_StencilRef": 100,
+        "_StencilRefShadow": 100,
+        "_EnableHairShadow": 1.0,
+        "renderQueue": 2020
+      },
+      "Eye": {
+        "_MaterialType": 2,
+        "_SrcBlend": 1,
+        "_DstBlend": 0,
+        "_StencilPassA": 0,
+        "_StencilPassB": 2,
+        "_StencilCompA": 5,
+        "_StencilCompB": 5,
+        "_StencilRef": 100,
+        "renderQueue": 2012
+      },
+      "Face": {
+        "_MaterialType": 1,
+        "_SrcBlend": 1,
+        "_DstBlend": 0,
+        "_StencilPassA": 0,
+        "_StencilPassB": 2,
+        "_StencilCompA": 5,
+        "_StencilCompB": 5,
+        "_StencilRef": 100,
+        "renderQueue": 2010
+      },
+      "Hair": {
+        "_MaterialType": 4,
+        "_SrcBlend": 5,
+        "_DstBlend": 10,
+        "_StencilPassA": 2,
+        "_StencilPassB": 0,
+        "_StencilCompA": 0,
+        "_StencilCompB": 0,
+        "_StencilRef": 0,
+        "renderQueue": 2030
+      },
+      "Glass": {
+        "_MaterialType": 5,
+        "_AlphaMode": 2,
+        "_SrcBlend": 5,
+        "_DstBlend": 10,
+        "_StencilPassA": 2,
+        "_StencilPassB": 0,
+        "_StencilCompA": 0,
+        "_StencilCompB": 0,
+        "_StencilRef": 0,
+        "renderQueue": 2030
+      },
+      "XingStar": {
+        "_MaterialType": 6,
+        "_AlphaMode": 2,
+        "_SrcBlend": 5,
+        "_DstBlend": 10,
+        "_StencilPassA": 2,
+        "_StencilPassB": 0,
+        "_StencilCompA": 0,
+        "_StencilCompB": 0,
+        "_StencilRef": 0,
+        "renderQueue": 2050
+      },
+      "Default": {
+        "_MaterialType": 0,
+        "_SrcBlend": 5,
+        "_DstBlend": 10,
+        "_StencilPassA": 2,
+        "_StencilPassB": 0,
+        "_StencilCompA": 0,
+        "_StencilCompB": 0,
+        "_StencilRef": 0,
+        "renderQueue": 2040
+      }
+    }
+  },
+  "SkipMeshes": ["Eyes", "Eye"]
+}
diff --git a/Editor/Manager/HoyoToonManager.json.meta b/Editor/Manager/HoyoToonManager.json.meta
diff --git a/Shaders/Genshin Impact/HoyoToonGenshin.shader b/Shaders/Genshin Impact/HoyoToonGenshin.shader
@@ -636,8 +636,8 @@ Shader "HoyoToon/Genshin/Character"
             [HideInInspector] end_hueshift ("", float) = 0
             //endex
             // Nyx State
-            [HideInInspector] start_nyx("Nyx State--{reference_property:_EnableNyxState}", Float) = 0
-                [Toggle] _EnableNyxState ("Enable Nyx State--{on_value_actions:[{value:0,actions:[{type:SET_PROPERTY,data:_EnableNyxBody=0},{type:SET_PROPERTY,data:_EnableNyxOutline=0}]}, {value:1,actions:[{type:SET_PROPERTY,data:_EnableNyxBody=1},{type:SET_PROPERTY,data:_EnableNyxOutline=1}]}]}", Float) = 0
+            [HideInInspector] start_nyx("NightSoul--{reference_property:_EnableNyxState}", Float) = 0
+                [Toggle] _EnableNyxState ("Enable NightSoul--{on_value_actions:[{value:0,actions:[{type:SET_PROPERTY,data:_EnableNyxBody=0},{type:SET_PROPERTY,data:_EnableNyxOutline=0}]}, {value:1,actions:[{type:SET_PROPERTY,data:_EnableNyxBody=1},{type:SET_PROPERTY,data:_EnableNyxOutline=1}]}]}", Float) = 0
                 [NoScaleOffset] _NyxStateOutlineColorRamp ("Color Ramp", 2D) = "gray" { }
                 [NoScaleOffset] _NyxStateOutlineNoise ("Noise(RG)", 2D) = "gray" { }
                 [Vector2] _NyxStateOutlineColorNoiseScale ("Noise Scale", Vector) = (2,2,0,0)
@@ -672,7 +672,7 @@ Shader "HoyoToon/Genshin/Character"
                     [HideInInspector] end_nyxvert ("", Float) = 0
                 [HideInInspector] end_nyxoutline ("", Float) = 0
 
-            [HideInInspector] end_nyx("Nyx State", Float) = 0
+            [HideInInspector] end_nyx("NightSoul", Float) = 0
         [HideInInspector] end_specialeffects ("", Float) = 0
         //Special Effects End
 

diff --git a/Shaders/Honkai Impact/HoyoToonHonkaiImpactPart2.shader b/Shaders/Honkai Impact/HoyoToonHonkaiImpactPart2.shader
@@ -2,6 +2,10 @@ Shader "HoyoToon/Honkai Impact/Character Part 2"
 {
     Properties 
   { 
+      [HideInInspector] shader_is_using_HoyoToon_editor("", Float)=0 
+      [HideInInspector] shader_is_using_HoyoToon_editor("", Float)=0 
+      [HideInInspector] shader_is_using_HoyoToon_editor("", Float)=0 
+      [HideInInspector] shader_is_using_HoyoToon_editor("", Float)=0 
         //Header
         //[HideInInspector] shader_master_label ("✧<b><i><color=#C69ECE>HoyoToon Honkai Impact Part 2</color></i></b>✧", Float) = 0
         [HideInInspector] ShaderBG ("UI/background", Float) = 0