Merge branch 'dev'

whiteflare · Jun 1, 2019 · 42cda0f · 42cda0f
2 parents d670196 + a35c9d5
commit 42cda0f
Show file tree

Hide file tree

Showing 39 changed files with 537 additions and 92 deletions.
diff --git a/Editor/WF_ShaderCustomEditor.cs b/Editor/WF_ShaderCustomEditor.cs
@@ -28,6 +28,8 @@ namespace UnlitWF
     public class ShaderCustomEditor : ShaderGUI
     {
         public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] properties) {
+            materialEditor.SetDefaultGUIWidths();
+
             // 現在無効なラベルを保持するリスト
             var disable = new List<string>();
             // プロパティを順に描画
@@ -55,6 +57,13 @@ public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] pro
                 // 描画
                 materialEditor.ShaderProperty(prop, prop.displayName);
             }
+
+            //EditorGUILayout.Space();
+            //EditorGUILayout.Space();
+            //GUILayout.Label("Advanced Options", EditorStyles.boldLabel);
+            //materialEditor.RenderQueueField();
+            //materialEditor.EnableInstancingField();
+            //materialEditor.DoubleSidedGIField();
         }
     }
 

diff --git a/Editor/WF_ShaderCustomEditor.cs.meta b/Editor/WF_ShaderCustomEditor.cs.meta
diff --git a/Editor/WF_ShaderToolWindow.cs b/Editor/WF_ShaderToolWindow.cs
diff --git a/Editor/WF_ShaderToolWindow.cs.meta b/Editor/WF_ShaderToolWindow.cs.meta
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_armor.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_armor.mat
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_body.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_body.mat
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_face.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_face.mat
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_faceoption.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_faceoption.mat
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_hair.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_hair.mat
diff --git a/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_photon.mat b/Examples/UnToon_Sample_Assets/2a7s_2eroVRC/mat/tex_photon.mat
diff --git a/Shaders/Unlit_WF_FakeFur_TransCutout.shader b/Shaders/Unlit_WF_FakeFur_TransCutout.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_FakeFur_TransCutout" {
 
     /*
      * authors:
-     *      ver:2019/05/18 whiteflare,
+     *      ver:2019/05/26 whiteflare,
      */
 
     Properties {
@@ -88,8 +88,7 @@ Shader "UnlitWF/WF_FakeFur_TransCutout" {
             _TS_2ndColor    ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
         [NoScaleOffset]
             _TS_2ndTex      ("[SH] 2nd Shade Texture", 2D) = "white" {}
-            _TS_1stPower    ("[SH] 1st Shade Power", Range(0, 2)) = 1
-            _TS_2ndPower    ("[SH] 2nd Shade Power", Range(0, 2)) = 1
+            _TS_Power       ("[SH] Shade Power", Range(0, 2)) = 1
             _TS_1stBorder   ("[SH] 1st Border", Range(0, 1)) = 0.4
             _TS_2ndBorder   ("[SH] 2nd Border", Range(0, 1)) = 0.2
             _TS_Feather     ("[SH] Feather", Range(0, 0.2)) = 0.05

diff --git a/Shaders/Unlit_WF_FakeFur_Transparent.shader b/Shaders/Unlit_WF_FakeFur_Transparent.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_FakeFur_Transparent" {
 
     /*
      * authors:
-     *      ver:2019/05/18 whiteflare,
+     *      ver:2019/05/26 whiteflare,
      */
 
     Properties {
@@ -87,8 +87,7 @@ Shader "UnlitWF/WF_FakeFur_Transparent" {
             _TS_2ndColor    ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
         [NoScaleOffset]
             _TS_2ndTex      ("[SH] 2nd Shade Texture", 2D) = "white" {}
-            _TS_1stPower    ("[SH] 1st Shade Power", Range(0, 2)) = 1
-            _TS_2ndPower    ("[SH] 2nd Shade Power", Range(0, 2)) = 1
+            _TS_Power       ("[SH] Shade Power", Range(0, 2)) = 1
             _TS_1stBorder   ("[SH] 1st Border", Range(0, 1)) = 0.4
             _TS_2ndBorder   ("[SH] 2nd Border", Range(0, 1)) = 0.2
             _TS_Feather     ("[SH] Feather", Range(0, 0.2)) = 0.05

diff --git a/Shaders/Unlit_WF_MatcapShadows_Color.shader b/Shaders/Unlit_WF_MatcapShadows_Color.shader
@@ -14,7 +14,7 @@
  *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  *  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-Shader "UnlitWF/Legacy/WF_MatcapShadows_Color" {
+Shader "UnlitWF/MatcapShadows/WF_MatcapShadows_Color" {
 
     /*
      * authors:

diff --git a/Shaders/Unlit_WF_MatcapShadows_ColorFade.shader b/Shaders/Unlit_WF_MatcapShadows_ColorFade.shader
@@ -14,7 +14,7 @@
  *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  *  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-Shader "UnlitWF/Legacy/WF_MatcapShadows_ColorFade" {
+Shader "UnlitWF/MatcapShadows/WF_MatcapShadows_ColorFade" {
 
     /*
      * authors:

diff --git a/Shaders/Unlit_WF_MatcapShadows_Simple.shader b/Shaders/Unlit_WF_MatcapShadows_Simple.shader
@@ -14,7 +14,7 @@
  *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  *  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-Shader "UnlitWF/Legacy/WF_MatcapShadows_Simple" {
+Shader "UnlitWF/MatcapShadows/WF_MatcapShadows_Simple" {
 
     /*
      * authors:

diff --git a/Shaders/Unlit_WF_MatcapShadows_Texture.shader b/Shaders/Unlit_WF_MatcapShadows_Texture.shader
@@ -14,7 +14,7 @@
  *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  *  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-Shader "UnlitWF/Legacy/WF_MatcapShadows_Texture" {
+Shader "UnlitWF/MatcapShadows/WF_MatcapShadows_Texture" {
 
     /*
      * authors:

diff --git a/Shaders/Unlit_WF_MatcapShadows_TransCutout.shader b/Shaders/Unlit_WF_MatcapShadows_TransCutout.shader
@@ -14,7 +14,7 @@
  *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  *  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-Shader "UnlitWF/Legacy/WF_MatcapShadows_TransCutout" {
+Shader "UnlitWF/MatcapShadows/WF_MatcapShadows_TransCutout" {
 
     /*
      * authors:

diff --git a/Shaders/Unlit_WF_MatcapShadows_Transparent.shader b/Shaders/Unlit_WF_MatcapShadows_Transparent.shader
@@ -14,7 +14,7 @@
  *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  *  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-Shader "UnlitWF/Legacy/WF_MatcapShadows_Transparent" {
+Shader "UnlitWF/MatcapShadows/WF_MatcapShadows_Transparent" {
 
     /*
      * authors:

diff --git a/Shaders/Unlit_WF_MatcapShadows_Transparent3Pass.shader b/Shaders/Unlit_WF_MatcapShadows_Transparent3Pass.shader
@@ -14,7 +14,7 @@
  *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  *  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-Shader "UnlitWF/Legacy/WF_MatcapShadows_Transparent3Pass" {
+Shader "UnlitWF/MatcapShadows/WF_MatcapShadows_Transparent3Pass" {
 
     /*
      * authors:

diff --git a/Shaders/Unlit_WF_MatcapShadows_Transparent_Mask.shader b/Shaders/Unlit_WF_MatcapShadows_Transparent_Mask.shader
@@ -14,7 +14,7 @@
  *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  *  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-Shader "UnlitWF/Legacy/WF_MatcapShadows_Transparent_Mask" {
+Shader "UnlitWF/MatcapShadows/WF_MatcapShadows_Transparent_Mask" {
 
     /*
      * authors:

diff --git a/Shaders/Unlit_WF_MatcapShadows_Transparent_MaskOut.shader b/Shaders/Unlit_WF_MatcapShadows_Transparent_MaskOut.shader
@@ -14,7 +14,7 @@
  *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  *  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-Shader "UnlitWF/Legacy/WF_MatcapShadows_Transparent_MaskOut" {
+Shader "UnlitWF/MatcapShadows/WF_MatcapShadows_Transparent_MaskOut" {
 
     /*
      * authors:

diff --git a/Shaders/Unlit_WF_MatcapShadows_Transparent_MaskOut_Blend.shader b/Shaders/Unlit_WF_MatcapShadows_Transparent_MaskOut_Blend.shader
@@ -14,7 +14,7 @@
  *  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  *  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-Shader "UnlitWF/Legacy/WF_MatcapShadows_Transparent_MaskOut_Blend" {
+Shader "UnlitWF/MatcapShadows/WF_MatcapShadows_Transparent_MaskOut_Blend" {
 
     /*
      * authors:

diff --git a/Shaders/Unlit_WF_UnToon_Texture.shader b/Shaders/Unlit_WF_UnToon_Texture.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_Texture" {
 
     /*
      * authors:
-     *      ver:2019/05/18 whiteflare,
+     *      ver:2019/05/26 whiteflare,
      */
 
     Properties {
@@ -105,8 +105,7 @@ Shader "UnlitWF/WF_UnToon_Texture" {
             _TS_2ndColor    ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
         [NoScaleOffset]
             _TS_2ndTex      ("[SH] 2nd Shade Texture", 2D) = "white" {}
-            _TS_1stPower    ("[SH] 1st Shade Power", Range(0, 2)) = 1
-            _TS_2ndPower    ("[SH] 2nd Shade Power", Range(0, 2)) = 1
+            _TS_Power       ("[SH] Shade Power", Range(0, 2)) = 1
             _TS_1stBorder   ("[SH] 1st Border", Range(0, 1)) = 0.4
             _TS_2ndBorder   ("[SH] 2nd Border", Range(0, 1)) = 0.2
             _TS_Feather     ("[SH] Feather", Range(0, 0.2)) = 0.05

diff --git a/Shaders/Unlit_WF_UnToon_TransCutout.shader b/Shaders/Unlit_WF_UnToon_TransCutout.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_TransCutout" {
 
     /*
      * authors:
-     *      ver:2019/05/18 whiteflare,
+     *      ver:2019/05/26 whiteflare,
      */
 
     Properties {
@@ -112,8 +112,7 @@ Shader "UnlitWF/WF_UnToon_TransCutout" {
             _TS_2ndColor    ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
         [NoScaleOffset]
             _TS_2ndTex      ("[SH] 2nd Shade Texture", 2D) = "white" {}
-            _TS_1stPower    ("[SH] 1st Shade Power", Range(0, 2)) = 1
-            _TS_2ndPower    ("[SH] 2nd Shade Power", Range(0, 2)) = 1
+            _TS_Power       ("[SH] Shade Power", Range(0, 2)) = 1
             _TS_1stBorder   ("[SH] 1st Border", Range(0, 1)) = 0.4
             _TS_2ndBorder   ("[SH] 2nd Border", Range(0, 1)) = 0.2
             _TS_Feather     ("[SH] Feather", Range(0, 0.2)) = 0.05

diff --git a/Shaders/Unlit_WF_UnToon_Transparent.shader b/Shaders/Unlit_WF_UnToon_Transparent.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_Transparent" {
 
     /*
      * authors:
-     *      ver:2019/05/18 whiteflare,
+     *      ver:2019/05/26 whiteflare,
      */
 
     Properties {
@@ -113,8 +113,7 @@ Shader "UnlitWF/WF_UnToon_Transparent" {
             _TS_2ndColor    ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
         [NoScaleOffset]
             _TS_2ndTex      ("[SH] 2nd Shade Texture", 2D) = "white" {}
-            _TS_1stPower    ("[SH] 1st Shade Power", Range(0, 2)) = 1
-            _TS_2ndPower    ("[SH] 2nd Shade Power", Range(0, 2)) = 1
+            _TS_Power       ("[SH] Shade Power", Range(0, 2)) = 1
             _TS_1stBorder   ("[SH] 1st Border", Range(0, 1)) = 0.4
             _TS_2ndBorder   ("[SH] 2nd Border", Range(0, 1)) = 0.2
             _TS_Feather     ("[SH] Feather", Range(0, 0.2)) = 0.05

diff --git a/Shaders/Unlit_WF_UnToon_Transparent3Pass.shader b/Shaders/Unlit_WF_UnToon_Transparent3Pass.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_Transparent3Pass" {
 
     /*
      * authors:
-     *      ver:2019/05/18 whiteflare,
+     *      ver:2019/05/26 whiteflare,
      */
 
     Properties {
@@ -114,8 +114,7 @@ Shader "UnlitWF/WF_UnToon_Transparent3Pass" {
             _TS_2ndColor    ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
         [NoScaleOffset]
             _TS_2ndTex      ("[SH] 2nd Shade Texture", 2D) = "white" {}
-            _TS_1stPower    ("[SH] 1st Shade Power", Range(0, 2)) = 1
-            _TS_2ndPower    ("[SH] 2nd Shade Power", Range(0, 2)) = 1
+            _TS_Power       ("[SH] Shade Power", Range(0, 2)) = 1
             _TS_1stBorder   ("[SH] 1st Border", Range(0, 1)) = 0.4
             _TS_2ndBorder   ("[SH] 2nd Border", Range(0, 1)) = 0.2
             _TS_Feather     ("[SH] Feather", Range(0, 0.2)) = 0.05

diff --git a/Shaders/Unlit_WF_UnToon_Transparent_Mask.shader b/Shaders/Unlit_WF_UnToon_Transparent_Mask.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_Mask" {
 
     /*
      * authors:
-     *      ver:2019/05/18 whiteflare,
+     *      ver:2019/05/26 whiteflare,
      */
 
     Properties {
@@ -118,8 +118,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_Mask" {
             _TS_2ndColor    ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
         [NoScaleOffset]
             _TS_2ndTex      ("[SH] 2nd Shade Texture", 2D) = "white" {}
-            _TS_1stPower    ("[SH] 1st Shade Power", Range(0, 2)) = 1
-            _TS_2ndPower    ("[SH] 2nd Shade Power", Range(0, 2)) = 1
+            _TS_Power       ("[SH] Shade Power", Range(0, 2)) = 1
             _TS_1stBorder   ("[SH] 1st Border", Range(0, 1)) = 0.4
             _TS_2ndBorder   ("[SH] 2nd Border", Range(0, 1)) = 0.2
             _TS_Feather     ("[SH] Feather", Range(0, 0.2)) = 0.05

diff --git a/Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader b/Shaders/Unlit_WF_UnToon_Transparent_MaskOut.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_MaskOut" {
 
     /*
      * authors:
-     *      ver:2019/05/18 whiteflare,
+     *      ver:2019/05/26 whiteflare,
      */
 
     Properties {
@@ -118,8 +118,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_MaskOut" {
             _TS_2ndColor    ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
         [NoScaleOffset]
             _TS_2ndTex      ("[SH] 2nd Shade Texture", 2D) = "white" {}
-            _TS_1stPower    ("[SH] 1st Shade Power", Range(0, 2)) = 1
-            _TS_2ndPower    ("[SH] 2nd Shade Power", Range(0, 2)) = 1
+            _TS_Power       ("[SH] Shade Power", Range(0, 2)) = 1
             _TS_1stBorder   ("[SH] 1st Border", Range(0, 1)) = 0.4
             _TS_2ndBorder   ("[SH] 2nd Border", Range(0, 1)) = 0.2
             _TS_Feather     ("[SH] Feather", Range(0, 0.2)) = 0.05

diff --git a/Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader b/Shaders/Unlit_WF_UnToon_Transparent_MaskOut_Blend.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_MaskOut_Blend" {
 
     /*
      * authors:
-     *      ver:2019/05/18 whiteflare,
+     *      ver:2019/05/26 whiteflare,
      */
 
     Properties {
@@ -119,8 +119,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_MaskOut_Blend" {
             _TS_2ndColor    ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
         [NoScaleOffset]
             _TS_2ndTex      ("[SH] 2nd Shade Texture", 2D) = "white" {}
-            _TS_1stPower    ("[SH] 1st Shade Power", Range(0, 2)) = 1
-            _TS_2ndPower    ("[SH] 2nd Shade Power", Range(0, 2)) = 1
+            _TS_Power       ("[SH] Shade Power", Range(0, 2)) = 1
             _TS_1stBorder   ("[SH] 1st Border", Range(0, 1)) = 0.4
             _TS_2ndBorder   ("[SH] 2nd Border", Range(0, 1)) = 0.2
             _TS_Feather     ("[SH] Feather", Range(0, 0.2)) = 0.05

diff --git a/Shaders/Unlit_WF_UnToon_Transparent_Outline.shader b/Shaders/Unlit_WF_UnToon_Transparent_Outline.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_Outline" {
 
     /*
      * authors:
-     *      ver:2019/05/18 whiteflare,
+     *      ver:2019/05/26 whiteflare,
      */
 
     Properties {
@@ -113,8 +113,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_Outline" {
             _TS_2ndColor    ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
         [NoScaleOffset]
             _TS_2ndTex      ("[SH] 2nd Shade Texture", 2D) = "white" {}
-            _TS_1stPower    ("[SH] 1st Shade Power", Range(0, 2)) = 1
-            _TS_2ndPower    ("[SH] 2nd Shade Power", Range(0, 2)) = 1
+            _TS_Power       ("[SH] Shade Power", Range(0, 2)) = 1
             _TS_1stBorder   ("[SH] 1st Border", Range(0, 1)) = 0.4
             _TS_2ndBorder   ("[SH] 2nd Border", Range(0, 1)) = 0.2
             _TS_Feather     ("[SH] Feather", Range(0, 0.2)) = 0.05

diff --git a/Shaders/Unlit_WF_UnToon_Transparent_Outline_3Pass.shader b/Shaders/Unlit_WF_UnToon_Transparent_Outline_3Pass.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_Outline_3Pass" {
 
     /*
      * authors:
-     *      ver:2019/05/18 whiteflare,
+     *      ver:2019/05/26 whiteflare,
      */
 
     Properties {
@@ -114,8 +114,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_Outline_3Pass" {
             _TS_2ndColor    ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
         [NoScaleOffset]
             _TS_2ndTex      ("[SH] 2nd Shade Texture", 2D) = "white" {}
-            _TS_1stPower    ("[SH] 1st Shade Power", Range(0, 2)) = 1
-            _TS_2ndPower    ("[SH] 2nd Shade Power", Range(0, 2)) = 1
+            _TS_Power       ("[SH] Shade Power", Range(0, 2)) = 1
             _TS_1stBorder   ("[SH] 1st Border", Range(0, 1)) = 0.4
             _TS_2ndBorder   ("[SH] 2nd Border", Range(0, 1)) = 0.2
             _TS_Feather     ("[SH] Feather", Range(0, 0.2)) = 0.05

diff --git a/Shaders/Unlit_WF_UnToon_Transparent_Outline_MaskOut.shader b/Shaders/Unlit_WF_UnToon_Transparent_Outline_MaskOut.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_Outline_MaskOut" {
 
     /*
      * authors:
-     *      ver:2019/05/18 whiteflare,
+     *      ver:2019/05/26 whiteflare,
      */
 
     Properties {
@@ -118,8 +118,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_Outline_MaskOut" {
             _TS_2ndColor    ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
         [NoScaleOffset]
             _TS_2ndTex      ("[SH] 2nd Shade Texture", 2D) = "white" {}
-            _TS_1stPower    ("[SH] 1st Shade Power", Range(0, 2)) = 1
-            _TS_2ndPower    ("[SH] 2nd Shade Power", Range(0, 2)) = 1
+            _TS_Power       ("[SH] Shade Power", Range(0, 2)) = 1
             _TS_1stBorder   ("[SH] 1st Border", Range(0, 1)) = 0.4
             _TS_2ndBorder   ("[SH] 2nd Border", Range(0, 1)) = 0.2
             _TS_Feather     ("[SH] Feather", Range(0, 0.2)) = 0.05

diff --git a/Shaders/Unlit_WF_UnToon_Transparent_Outline_MaskOut_Blend.shader b/Shaders/Unlit_WF_UnToon_Transparent_Outline_MaskOut_Blend.shader
@@ -18,7 +18,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_Outline_MaskOut_Blend" {
 
     /*
      * authors:
-     *      ver:2019/05/18 whiteflare,
+     *      ver:2019/05/26 whiteflare,
      */
 
     Properties {
@@ -119,8 +119,7 @@ Shader "UnlitWF/WF_UnToon_Transparent_Outline_MaskOut_Blend" {
             _TS_2ndColor    ("[SH] 2nd Shade Color", Color) = (0.5, 0.5, 0.8, 1)
         [NoScaleOffset]
             _TS_2ndTex      ("[SH] 2nd Shade Texture", 2D) = "white" {}
-            _TS_1stPower    ("[SH] 1st Shade Power", Range(0, 2)) = 1
-            _TS_2ndPower    ("[SH] 2nd Shade Power", Range(0, 2)) = 1
+            _TS_Power       ("[SH] Shade Power", Range(0, 2)) = 1
             _TS_1stBorder   ("[SH] 1st Border", Range(0, 1)) = 0.4
             _TS_2ndBorder   ("[SH] 2nd Border", Range(0, 1)) = 0.2
             _TS_Feather     ("[SH] Feather", Range(0, 0.2)) = 0.05