Release v.2.0.8 for Legacy pipeline / Bug fix for Issue #82: Fixed a …

…bug that caused the brightness of the outline to change unexpectedly in some VRChat worlds. (#91)
unity3d-jp · Sep 13, 2021 · 0f2e012 · 0f2e012
1 parent 2f445c8
commit 0f2e012
Show file tree

Hide file tree

Showing 159 changed files with 531 additions and 725 deletions.
diff --git a/Assets/Toon/Editor/UTS2GUI.cs b/Assets/Toon/Editor/UTS2GUI.cs
@@ -1,5 +1,5 @@
 //Unitychan Toon Shader ver.2.0
-//UTS2GUI.cs for UTS2 v.2.0.7.5
+//UTS2GUI.cs for UTS2 v.2.0.8
 //[email protected]
 //https://github.com/unity3d-jp/UnityChanToonShaderVer2_Project
 //(C)Unity Technologies Japan/UCL
@@ -36,7 +36,7 @@ public enum _EmissiveMode{
 
         //各種設定保持用.
         //UTS2のバージョン.
-        static float _UTS2VersionNumber = 2.075f; 
+        static float _UTS2VersionNumber = 2.08f; 
         //
         static int _StencilNo_Setting;
         static bool _OriginalInspector = false;
@@ -337,7 +337,7 @@ public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] pro
 
             //v.2.0.7.2 / v.2.0.7.4
             //v.2.0.4.3p1以前のBaseMap名との互換性対策、および_utsVersionの更新をおこなう.
-            //shader側で新規設定されるのは、_utsVersion = 2.07fなので、CustomGUI側でサブバージョンを付ける.
+            //shader側で新規設定されるのは、_utsVersion = 2.08fなので、CustomGUI側でサブバージョンを付ける.
             if(material.GetFloat("_utsVersion") < _UTS2VersionNumber)
             {
                 //_MainTexを使っている世代は、_BaseMapにはテクスチャ情報はない.
@@ -587,11 +587,11 @@ void CheckUtsTechnique(Material material){
         void OpenManualLink(){
             if (GUILayout.Button("日本語マニュアル",middleButtonStyle))
             {
-                    Application.OpenURL("https://github.com/unity3d-jp/UnityChanToonShaderVer2_Project/blob/master/Manual/UTS2_Manual_ja.md");
+                    Application.OpenURL("https://github.com/unity3d-jp/UnityChanToonShaderVer2_Project/blob/release/legacy/2.0/Manual/UTS2_Manual_ja.md");
             }
             if (GUILayout.Button("English manual",middleButtonStyle))
             {
-                    Application.OpenURL("https://github.com/unity3d-jp/UnityChanToonShaderVer2_Project/blob/master/Manual/UTS2_Manual_en.md");
+                    Application.OpenURL("https://github.com/unity3d-jp/UnityChanToonShaderVer2_Project/blob/release/legacy/2.0/Manual/UTS2_Manual_en.md");
             }
         }
 

diff --git a/Assets/Toon/Materials/CellTouch_ToonShader_Face.mat b/Assets/Toon/Materials/CellTouch_ToonShader_Face.mat
@@ -124,6 +124,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 1
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 1
     - _Is_NormalMapForMatCap: 0
     - _Is_NormalMapToBase: 0
@@ -170,7 +171,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}

diff --git a/Assets/Toon/Materials/CellTouch_ToonShader_Face_Firefly.mat b/Assets/Toon/Materials/CellTouch_ToonShader_Face_Firefly.mat
@@ -124,6 +124,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 1
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 1
     - _Is_NormalMapForMatCap: 0
     - _Is_NormalMapToBase: 0
@@ -170,7 +171,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 1, g: 1, b: 1, a: 1}

diff --git a/Assets/Toon/Materials/CellTouch_ToonShader_Fhair2_StencilOut.mat b/Assets/Toon/Materials/CellTouch_ToonShader_Fhair2_StencilOut.mat
@@ -124,6 +124,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 1
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 1
     - _Is_NormalMapForMatCap: 0
     - _Is_NormalMapToBase: 1
@@ -171,7 +172,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 0.8602941, g: 0.664852, b: 0.45544982, a: 1}

diff --git a/Assets/Toon/Materials/CellTouch_ToonShader_Fhair_StencilOut.mat b/Assets/Toon/Materials/CellTouch_ToonShader_Fhair_StencilOut.mat
@@ -124,6 +124,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 1
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 1
     - _Is_NormalMapForMatCap: 1
     - _Is_NormalMapToBase: 1
@@ -171,7 +172,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 0.8602941, g: 0.664852, b: 0.45544982, a: 1}

diff --git a/Assets/Toon/Materials/CellTouch_ToonShader_Hair_Clipping.mat b/Assets/Toon/Materials/CellTouch_ToonShader_Hair_Clipping.mat
@@ -132,6 +132,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 1
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 1
     - _Is_NormalMapForMatCap: 0
     - _Is_NormalMapToBase: 0
@@ -178,7 +179,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 0.8602941, g: 0.664852, b: 0.45544982, a: 1}

diff --git a/Assets/Toon/Materials/CellTouch_ToonShader_Hair_Clipping_Firefly.mat b/Assets/Toon/Materials/CellTouch_ToonShader_Hair_Clipping_Firefly.mat
@@ -132,6 +132,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 1
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 1
     - _Is_NormalMapForMatCap: 0
     - _Is_NormalMapToBase: 0
@@ -178,7 +179,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 0.8602941, g: 0.664852, b: 0.45544982, a: 1}

diff --git a/Assets/Toon/Materials/CellTouch_ToonShader_Head_Clipping.mat b/Assets/Toon/Materials/CellTouch_ToonShader_Head_Clipping.mat
@@ -132,6 +132,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 1
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 1
     - _Is_NormalMapForMatCap: 0
     - _Is_NormalMapToBase: 0
@@ -178,7 +179,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 0.8602941, g: 0.664852, b: 0.45544982, a: 1}

diff --git a/Assets/Toon/Materials/CellTouch_ToonShader_Main.mat b/Assets/Toon/Materials/CellTouch_ToonShader_Main.mat
@@ -124,6 +124,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 1
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 1
     - _Is_NormalMapForMatCap: 0
     - _Is_NormalMapToBase: 0
@@ -170,7 +171,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 0.74740475, g: 0.69420415, b: 0.88235295, a: 1}

diff --git a/Assets/Toon/Materials/CellTouch_ToonShader_Main_Firefly.mat b/Assets/Toon/Materials/CellTouch_ToonShader_Main_Firefly.mat
@@ -124,6 +124,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 1
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 1
     - _Is_NormalMapForMatCap: 0
     - _Is_NormalMapToBase: 0
@@ -170,7 +171,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 0.85294116, g: 0.82158303, b: 0.82158303, a: 1}

diff --git a/Assets/Toon/Materials/Emissive_UTS2.mat b/Assets/Toon/Materials/Emissive_UTS2.mat
@@ -150,7 +150,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 0, g: 0, b: 0, a: 1}
     - _2nd_ShadeColor: {r: 0, g: 0, b: 0, a: 1}

diff --git a/Assets/Toon/Materials/ToonShader_Eye_Clipping_StencilMask.mat b/Assets/Toon/Materials/ToonShader_Eye_Clipping_StencilMask.mat
@@ -158,7 +158,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 0.43382353, g: 0.43382353, b: 0.43382353, a: 1}
     - _2nd_ShadeColor: {r: 1, g: 1, b: 1, a: 1}

diff --git a/Assets/Toon/Materials/ToonShader_Eye_Clipping_StencilMask_ABN.mat b/Assets/Toon/Materials/ToonShader_Eye_Clipping_StencilMask_ABN.mat
@@ -158,7 +158,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 0.15294118, g: 0.15294118, b: 0.15294118, a: 1}
     - _2nd_ShadeColor: {r: 0.15294118, g: 0.15294118, b: 0.15294118, a: 1}

diff --git a/Assets/Toon/Materials/ToonShader_Eye_Clipping_StencilMask_Firefly.mat b/Assets/Toon/Materials/ToonShader_Eye_Clipping_StencilMask_Firefly.mat
@@ -151,7 +151,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 0.43382353, g: 0.43382353, b: 0.43382353, a: 1}
     - _2nd_ShadeColor: {r: 0, g: 0, b: 0, a: 1}

diff --git a/Assets/Toon/Materials/ToonShader_Eyebrow_StencilMask.mat b/Assets/Toon/Materials/ToonShader_Eyebrow_StencilMask.mat
@@ -158,7 +158,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}

diff --git a/Assets/Toon/Materials/ToonShader_Eyebrow_StencilMask_ABN.mat b/Assets/Toon/Materials/ToonShader_Eyebrow_StencilMask_ABN.mat
@@ -158,7 +158,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 0.15294118, g: 0.15294118, b: 0.15294118, a: 1}
     - _2nd_ShadeColor: {r: 0.15294118, g: 0.15294118, b: 0.15294118, a: 1}

diff --git a/Assets/Toon/Materials/ToonShader_Face.mat b/Assets/Toon/Materials/ToonShader_Face.mat
@@ -124,6 +124,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 1
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 1
     - _Is_NormalMapForMatCap: 0
     - _Is_NormalMapToBase: 0
@@ -170,7 +171,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 0.7490196, g: 0.69411767, b: 0.88235295, a: 1}

diff --git a/Assets/Toon/Materials/ToonShader_Face_ABN.mat b/Assets/Toon/Materials/ToonShader_Face_ABN.mat
@@ -124,6 +124,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 0
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 0
     - _Is_NormalMapForMatCap: 0
     - _Is_NormalMapToBase: 0
@@ -170,7 +171,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 0.15294118, g: 0.15294118, b: 0.15294118, a: 1}
     - _2nd_ShadeColor: {r: 0.15294118, g: 0.15294118, b: 0.15294118, a: 1}

diff --git a/Assets/Toon/Materials/ToonShader_Fhair2.mat b/Assets/Toon/Materials/ToonShader_Fhair2.mat
@@ -124,6 +124,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 1
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 1
     - _Is_NormalMapForMatCap: 1
     - _Is_NormalMapToBase: 1
@@ -171,7 +172,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 0.8602941, g: 0.664852, b: 0.45544982, a: 1}

diff --git a/Assets/Toon/Materials/ToonShader_Fhair_StencilOut.mat b/Assets/Toon/Materials/ToonShader_Fhair_StencilOut.mat
@@ -124,6 +124,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 1
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 1
     - _Is_NormalMapForMatCap: 1
     - _Is_NormalMapToBase: 1
@@ -171,7 +172,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 0.8602941, g: 0.664852, b: 0.45544982, a: 1}

diff --git a/Assets/Toon/Materials/ToonShader_Fhair_StencilOut_ABN.mat b/Assets/Toon/Materials/ToonShader_Fhair_StencilOut_ABN.mat
@@ -124,6 +124,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 0
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 0
     - _Is_NormalMapForMatCap: 1
     - _Is_NormalMapToBase: 1
@@ -171,7 +172,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 0.15294118, g: 0.15294118, b: 0.15294118, a: 1}
     - _2nd_ShadeColor: {r: 0, g: 0, b: 0, a: 1}

diff --git a/Assets/Toon/Materials/ToonShader_Hair_Clipping.mat b/Assets/Toon/Materials/ToonShader_Hair_Clipping.mat
@@ -132,6 +132,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 1
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 1
     - _Is_NormalMapForMatCap: 1
     - _Is_NormalMapToBase: 1
@@ -178,7 +179,7 @@ Material:
     - _Use_BaseAs1st: 1
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 0.8602941, g: 0.664852, b: 0.45544982, a: 1}

diff --git a/Assets/Toon/Materials/ToonShader_Hair_Clipping_ABN.mat b/Assets/Toon/Materials/ToonShader_Hair_Clipping_ABN.mat
@@ -132,6 +132,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 0
     - _Is_LightColor_MatCap: 0
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 0
     - _Is_NormalMapForMatCap: 1
     - _Is_NormalMapToBase: 1
@@ -178,7 +179,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 0.15294118, g: 0.15294118, b: 0.15294118, a: 1}
     - _2nd_ShadeColor: {r: 0, g: 0, b: 0, a: 1}

diff --git a/Assets/Toon/Materials/ToonShader_Hair_Clipping_ABN_FrontCulling.mat b/Assets/Toon/Materials/ToonShader_Hair_Clipping_ABN_FrontCulling.mat
@@ -132,6 +132,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 0
     - _Is_LightColor_MatCap: 0
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 0
     - _Is_NormalMapForMatCap: 1
     - _Is_NormalMapToBase: 1
@@ -178,7 +179,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 0.15294118, g: 0.15294118, b: 0.15294118, a: 1}
     - _2nd_ShadeColor: {r: 0, g: 0, b: 0, a: 1}

diff --git a/Assets/Toon/Materials/ToonShader_Head_Clipping.mat b/Assets/Toon/Materials/ToonShader_Head_Clipping.mat
@@ -132,6 +132,7 @@ Material:
     - _Is_LightColor_Base: 1
     - _Is_LightColor_HighColor: 1
     - _Is_LightColor_MatCap: 1
+    - _Is_LightColor_Outline: 1
     - _Is_LightColor_RimLight: 1
     - _Is_NormalMapForMatCap: 0
     - _Is_NormalMapToBase: 0
@@ -178,7 +179,7 @@ Material:
     - _Use_BaseAs1st: 0
     - _simpleUI: 0
     - _utsTechnique: 0
-    - _utsVersion: 2.075
+    - _utsVersion: 2.08
     m_Colors:
     - _1st_ShadeColor: {r: 1, g: 1, b: 1, a: 1}
     - _2nd_ShadeColor: {r: 0.6691177, g: 0.4767294, b: 0.2705991, a: 1}