Răsfoiți Sursa

[unity] SkeletonGraphic: Fixed incorrect settings as material variants 'CanvasGroupStraight'. See commit f4c0f64.

Harald Csaszar 1 an în urmă
părinte
comite
ae315f555b
14 a modificat fișierele cu 95 adăugiri și 35 ștergeri
  1. 10 2
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/CanvasGroupCompatible/SkeletonGraphicTintBlack-CanvasGroupStraight.mat
  2. 10 3
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicAdditive-Straight.mat
  3. 10 3
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicDefault-Straight.mat
  4. 10 3
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicDefaultGrayscale-Straight.mat
  5. 10 3
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicDefaultOutline-Straight.mat
  6. 10 3
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicFill-Straight.mat
  7. 10 3
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicMultiply-Straight.mat
  8. 10 3
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicScreen-Straight.mat
  9. 10 3
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicTintBlack-Straight.mat
  10. 1 2
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicTintBlackAdditive-Straight.mat
  11. 1 2
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicTintBlackMultiply-Straight.mat
  12. 1 2
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicTintBlackOutline-Straight.mat
  13. 1 2
      spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicTintBlackScreen-Straight.mat
  14. 1 1
      spine-unity/Assets/Spine/package.json

+ 10 - 2
spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/CanvasGroupCompatible/SkeletonGraphicTintBlack-CanvasGroupStraight.mat

@@ -2,20 +2,27 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SkeletonGraphicTintBlack-CanvasGroupStraight
   m_Shader: {fileID: 4800000, guid: f64c7bc238bb2c246b8ca1912b2b6b9c, type: 3}
-  m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _CANVAS_GROUP_COMPATIBLE
+  - _STRAIGHT_ALPHA_INPUT
+  m_InvalidKeywords:
+  - _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -55,6 +62,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 1
     - _CanvasGroupCompatible: 1

+ 10 - 3
spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicAdditive-Straight.mat

@@ -2,20 +2,26 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SkeletonGraphicAdditive-Straight
   m_Shader: {fileID: 4800000, guid: a1e4ab34b07f81e4e94f0d241c416669, type: 3}
-  m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
+  m_InvalidKeywords:
+  - _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -59,10 +65,11 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - PixelSnap: 0
     - _BumpScale: 1
-    - _CanvasGroupCompatible: 1
+    - _CanvasGroupCompatible: 0
     - _ColorMask: 15
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1

+ 10 - 3
spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicDefault-Straight.mat

@@ -2,20 +2,26 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SkeletonGraphicDefault-Straight
   m_Shader: {fileID: 4800000, guid: fa95b0fb6983c0f40a152e6f9aa82bfb, type: 3}
-  m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
+  m_InvalidKeywords:
+  - _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -59,10 +65,11 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - PixelSnap: 0
     - _BumpScale: 1
-    - _CanvasGroupCompatible: 1
+    - _CanvasGroupCompatible: 0
     - _ColorMask: 15
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1

+ 10 - 3
spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicDefaultGrayscale-Straight.mat

@@ -2,20 +2,26 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SkeletonGraphicDefaultGrayscale-Straight
   m_Shader: {fileID: 4800000, guid: fa95b0fb6983c0f40a152e6f9aa82bfb, type: 3}
-  m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
+  m_InvalidKeywords:
+  - _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -59,10 +65,11 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - PixelSnap: 0
     - _BumpScale: 1
-    - _CanvasGroupCompatible: 1
+    - _CanvasGroupCompatible: 0
     - _ColorMask: 15
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1

+ 10 - 3
spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicDefaultOutline-Straight.mat

@@ -2,20 +2,26 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SkeletonGraphicDefaultOutline-Straight
   m_Shader: {fileID: 4800000, guid: 8f5d14d2a7fedb84998c50eb96c8b748, type: 3}
-  m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
+  - _USE8NEIGHBOURHOOD_ON
+  m_InvalidKeywords: []
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -59,10 +65,11 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - PixelSnap: 0
     - _BumpScale: 1
-    - _CanvasGroupCompatible: 1
+    - _CanvasGroupCompatible: 0
     - _ColorMask: 15
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1

+ 10 - 3
spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicFill-Straight.mat

@@ -2,20 +2,26 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SkeletonGraphicFill-Straight
   m_Shader: {fileID: 4800000, guid: c02377d9afbb50e49ab27049e59fb5f8, type: 3}
-  m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
+  m_InvalidKeywords:
+  - _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -59,10 +65,11 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - PixelSnap: 0
     - _BumpScale: 1
-    - _CanvasGroupCompatible: 1
+    - _CanvasGroupCompatible: 0
     - _ColorMask: 15
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1

+ 10 - 3
spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicMultiply-Straight.mat

@@ -2,20 +2,26 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SkeletonGraphicMultiply-Straight
   m_Shader: {fileID: 4800000, guid: cfbf95ed0fe6c554c8c2ee6c8325937c, type: 3}
-  m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
+  m_InvalidKeywords:
+  - _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -59,10 +65,11 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - PixelSnap: 0
     - _BumpScale: 1
-    - _CanvasGroupCompatible: 1
+    - _CanvasGroupCompatible: 0
     - _ColorMask: 15
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1

+ 10 - 3
spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicScreen-Straight.mat

@@ -2,20 +2,26 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SkeletonGraphicScreen-Straight
   m_Shader: {fileID: 4800000, guid: c61244023592f95479fddd71b5067683, type: 3}
-  m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
+  m_InvalidKeywords:
+  - _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -59,10 +65,11 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - PixelSnap: 0
     - _BumpScale: 1
-    - _CanvasGroupCompatible: 1
+    - _CanvasGroupCompatible: 0
     - _ColorMask: 15
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1

+ 10 - 3
spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicTintBlack-Straight.mat

@@ -2,20 +2,26 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SkeletonGraphicTintBlack-Straight
   m_Shader: {fileID: 4800000, guid: f64c7bc238bb2c246b8ca1912b2b6b9c, type: 3}
-  m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
+  m_InvalidKeywords:
+  - _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -55,9 +61,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 1
-    - _CanvasGroupCompatible: 1
+    - _CanvasGroupCompatible: 0
     - _ColorMask: 15
     - _Cutoff: 0.5
     - _DarkColorAlphaAdditive: 0

+ 1 - 2
spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicTintBlackAdditive-Straight.mat

@@ -12,7 +12,6 @@ Material:
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
-  - _CANVAS_GROUP_COMPATIBLE
   - _STRAIGHT_ALPHA_INPUT
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -65,7 +64,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _BumpScale: 1
-    - _CanvasGroupCompatible: 1
+    - _CanvasGroupCompatible: 0
     - _ColorMask: 15
     - _Cutoff: 0.5
     - _DarkColorAlphaAdditive: 0

+ 1 - 2
spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicTintBlackMultiply-Straight.mat

@@ -12,7 +12,6 @@ Material:
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
-  - _CANVAS_GROUP_COMPATIBLE
   - _STRAIGHT_ALPHA_INPUT
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -65,7 +64,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _BumpScale: 1
-    - _CanvasGroupCompatible: 1
+    - _CanvasGroupCompatible: 0
     - _ColorMask: 15
     - _Cutoff: 0.5
     - _DarkColorAlphaAdditive: 0

+ 1 - 2
spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicTintBlackOutline-Straight.mat

@@ -12,7 +12,6 @@ Material:
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
-  - _CANVAS_GROUP_COMPATIBLE
   - _STRAIGHT_ALPHA_INPUT
   - _USE8NEIGHBOURHOOD_ON
   m_InvalidKeywords: []
@@ -65,7 +64,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _BumpScale: 1
-    - _CanvasGroupCompatible: 1
+    - _CanvasGroupCompatible: 0
     - _ColorMask: 15
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1

+ 1 - 2
spine-unity/Assets/Spine/Runtime/spine-unity/Materials/SkeletonGraphic-StaightAlphaTexture/SkeletonGraphicTintBlackScreen-Straight.mat

@@ -12,7 +12,6 @@ Material:
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
-  - _CANVAS_GROUP_COMPATIBLE
   - _STRAIGHT_ALPHA_INPUT
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -65,7 +64,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _BumpScale: 1
-    - _CanvasGroupCompatible: 1
+    - _CanvasGroupCompatible: 0
     - _ColorMask: 15
     - _Cutoff: 0.5
     - _DarkColorAlphaAdditive: 0

+ 1 - 1
spine-unity/Assets/Spine/package.json

@@ -2,7 +2,7 @@
 	"name": "com.esotericsoftware.spine.spine-unity",
 	"displayName": "spine-unity Runtime",
 	"description": "This plugin provides the spine-unity runtime core.",
-	"version": "4.2.55",
+	"version": "4.2.56",
 	"unity": "2018.3",
 	"author": {
 		"name": "Esoteric Software",