Refactor: Shader and Material Consolidation [MTT-2900] (#648)

* First go at re-organizing / cleaning house of all of our VFX materials and shaders, as well as cleaning up some references and making changes to prefabs to support these changes

* Another pass on the shader consolidation, more renames, as well as optimization of the bounds for the torch fire effect. also some reserialization of character toon materials

* Reserialization of these mats

* Renamed this to match my shadergraph naming convention

* Recommiting M_Lava to hopefully fix yamato test issue

* Fixed up a bunch of broken references--I think I should've saved the project before committing to make sure I had all the meta files and references the refactor needed. Also cleared some node behaviour change notices that were popping up in the console

Author: jilfranco-unity

Assets/BossRoom/Material/Characters/Character_Shadow.mat

@@ -8,14 +8,14 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Character_Shadow
-  m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: a9ba79dc821093a4c9041bcede85096b, type: 3}
   m_ValidKeywords:
   - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
+  m_CustomRenderQueue: -1
   stringTagMap:
     RenderType: Transparent
   disabledShaderPasses:
@@ -52,6 +52,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 6eb539aefcd5a7846af91c0a77161b92, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _MainTexture:
+        m_Texture: {fileID: 2800000, guid: 6eb539aefcd5a7846af91c0a77161b92, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -86,10 +90,12 @@ Material:
     - _Blend: 0
     - _BlendOp: 0
     - _BumpScale: 1
+    - _CastShadows: 0
     - _ClearCoatMask: 0
     - _ClearCoatSmoothness: 0
     - _Cull: 2
     - _Cutoff: 0.5
+    - _Depth_Blend: 0
     - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
     - _DstBlend: 10
@@ -100,6 +106,7 @@ Material:
     - _Metallic: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.005
+    - _QueueControl: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _SampleGI: 0
@@ -108,12 +115,17 @@ Material:
     - _SpecularHighlights: 1
     - _SrcBlend: 5
     - _Surface: 1
+    - _UseAlpha: 1
+    - _UseSoftParticles: 0
     - _WorkflowMode: 1
+    - _ZTest: 4
     - _ZWrite: 0
+    - _ZWriteControl: 0
     m_Colors:
     - _BaseColor: {r: 0, g: 0, b: 0, a: 0.54509807}
     - _Color: {r: 0, g: 0, b: 0, a: 0.54509807}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _MainTextureTilingOffset: {r: 1, g: 1, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &2085413229483183920

Assets/BossRoom/Material/Characters/Toon/Hair_Archer_Boy.mat

@@ -83,6 +83,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.771
     - _RimThreshold: 0
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Hair_Archer_Girl.mat

@@ -83,6 +83,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.778
     - _RimThreshold: 0
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Hair_Imp_Bomb.mat

@@ -96,6 +96,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.778
     - _RimThreshold: 0
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Hair_Mage_Boy.mat

@@ -96,6 +96,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.778
     - _RimThreshold: 0
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Hair_Tank_Boy.mat

@@ -83,6 +83,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.588
     - _RimThreshold: 0
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Hair_Tank_Girl.mat

@@ -95,6 +95,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.667
     - _RimThreshold: 0
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Head_Archer_Boy.mat

@@ -95,6 +95,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.667
     - _RimThreshold: 0
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Head_Archer_Girl.mat

@@ -95,6 +95,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.667
     - _RimThreshold: 0
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Head_Mage_Boy.mat

@@ -95,6 +95,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.667
     - _RimThreshold: 0
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Head_Tank_Boy.mat

@@ -82,6 +82,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.674
     - _RimThreshold: 0
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Head_Tank_Girl.mat

@@ -82,6 +82,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.428
     - _RimThreshold: 0.123
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Helmet_Imp.mat

@@ -95,6 +95,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.208
     - _RimThreshold: 0.595
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Torso_Boss.mat

@@ -95,6 +95,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.366
     - _RimThreshold: 0
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Torso_Mage_Girl.mat

@@ -95,6 +95,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.264
     - _RimThreshold: 0.058
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Weapons_Mage.mat

@@ -82,6 +82,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.343
     - _RimThreshold: 0.145
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Weapons_Tank.mat

@@ -82,6 +82,8 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
     - _RimAmount: 0.384
     - _RimThreshold: 0
     - _SmoothnessTextureChannel: 0

Assets/BossRoom/Material/Characters/Toon/Weapons_VandalImp.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: boss_arena
+  m_Name: M_BossFloor
   m_Shader: {fileID: -6465566751694194690, guid: 58d945a80f1f06c4db5c1fa66a0afc55, type: 3}
   m_ValidKeywords: []
   m_InvalidKeywords: