Skip to content

Commit a6dde6c

Browse files
jdepuyjdepuy
authored
Temporary update to shader S_SimpleDissolve and corresponding FX. (#248)
1 parent 0774318 commit a6dde6c

File tree

9 files changed

+72
-252
lines changed

9 files changed

+72
-252
lines changed

‎Assets/BossRoom/VFX/Materials/FX_M_GroundCrack.mat‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ Material:
4747
m_Texture: {fileID: 2800000, guid: 79ffdab583577334cb184c42218dce5f, type: 3}
4848
m_Scale: {x: 1, y: 1}
4949
m_Offset: {x: 0, y: 0}
50+
- _MainTexture:
51+
m_Texture: {fileID: 2800000, guid: 79ffdab583577334cb184c42218dce5f, type: 3}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
5054
- _MetallicGlossMap:
5155
m_Texture: {fileID: 0}
5256
m_Scale: {x: 1, y: 1}
@@ -95,6 +99,7 @@ Material:
9599
- _SpecularHighlights: 1
96100
- _SrcBlend: 1
97101
- _StepSubtract: 1
102+
- _Switch_Alpha: 0
98103
- _UVSec: 0
99104
- _UseAlphaChannel: 0
100105
- _VertexAOpacity: 1

‎Assets/BossRoom/VFX/Materials/FX_M_GroundCrack_2.mat‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ Material:
4747
m_Texture: {fileID: 2800000, guid: 34a4d61e192b21a4bb3ab13482c439d7, type: 3}
4848
m_Scale: {x: 1, y: 1}
4949
m_Offset: {x: 0, y: 0}
50+
- _MainTexture:
51+
m_Texture: {fileID: 2800000, guid: 34a4d61e192b21a4bb3ab13482c439d7, type: 3}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
5054
- _MetallicGlossMap:
5155
m_Texture: {fileID: 0}
5256
m_Scale: {x: 1, y: 1}
@@ -95,6 +99,7 @@ Material:
9599
- _SpecularHighlights: 1
96100
- _SrcBlend: 1
97101
- _StepSubtract: 1
102+
- _Switch_Alpha: 0
98103
- _UVSec: 0
99104
- _UseAlphaChannel: 0
100105
- _VertexAOpacity: 1

‎Assets/BossRoom/VFX/Materials/FX_M_StylizeSmoke.mat‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Material:
1010
m_Name: FX_M_StylizeSmoke
1111
m_Shader: {fileID: 4800000, guid: 19584968e8d53424c9ce71b2c72d64f4, type: 3}
1212
m_ShaderKeywords: _HASDYNAMICDISSOLVE_ON _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON
13-
_VERTEXAOPACITY_ON
13+
_SWITCH_ALPHA_ON _VERTEXAOPACITY_ON
1414
m_LightmapFlags: 0
1515
m_EnableInstancingVariants: 0
1616
m_DoubleSidedGI: 0
@@ -48,6 +48,10 @@ Material:
4848
m_Texture: {fileID: 2800000, guid: 1ee97322756ea2c489f9311bd5c9f72d, type: 3}
4949
m_Scale: {x: 1, y: 1}
5050
m_Offset: {x: 0, y: 0}
51+
- _MainTexture:
52+
m_Texture: {fileID: 2800000, guid: fa9d4375ce230e1488b5a2680fd71074, type: 3}
53+
m_Scale: {x: 1, y: 2}
54+
m_Offset: {x: -0.25, y: -0.25}
5155
- _MetallicGlossMap:
5256
m_Texture: {fileID: 0}
5357
m_Scale: {x: 1, y: 1}
@@ -88,6 +92,7 @@ Material:
8892
- _SpecularHighlights: 1
8993
- _SrcBlend: 1
9094
- _StepSubtract: 1
95+
- _Switch_Alpha: 1
9196
- _UVSec: 0
9297
- _UseAlphaChannel: 0
9398
- _VertexAOpacity: 1

‎Assets/BossRoom/VFX/Materials/FX_M_Stylize_Smoke_falldown.mat‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: FX_M_Stylize_Smoke_falldown
1111
m_Shader: {fileID: 4800000, guid: 19584968e8d53424c9ce71b2c72d64f4, type: 3}
12-
m_ShaderKeywords: _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON _VERTEXAOPACITY_ON
12+
m_ShaderKeywords: _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON _SWITCH_ALPHA_ON _VERTEXAOPACITY_ON
1313
m_LightmapFlags: 0
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
@@ -47,6 +47,10 @@ Material:
4747
m_Texture: {fileID: 2800000, guid: 1ee97322756ea2c489f9311bd5c9f72d, type: 3}
4848
m_Scale: {x: 1, y: 1}
4949
m_Offset: {x: 0, y: 0}
50+
- _MainTexture:
51+
m_Texture: {fileID: 2800000, guid: cc5ee705b0abdca40b904a2b89a38d8b, type: 3}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
5054
- _MetallicGlossMap:
5155
m_Texture: {fileID: 0}
5256
m_Scale: {x: 1, y: 1}
@@ -87,6 +91,7 @@ Material:
8791
- _SpecularHighlights: 1
8892
- _SrcBlend: 1
8993
- _StepSubtract: 1
94+
- _Switch_Alpha: 1
9095
- _UVSec: 0
9196
- _UseAlphaChannel: 0
9297
- _VertexAOpacity: 1

‎Assets/BossRoom/VFX/Materials/FX_MaskedPanner.mat‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Material:
1010
m_Name: FX_MaskedPanner
1111
m_Shader: {fileID: 4800000, guid: 19584968e8d53424c9ce71b2c72d64f4, type: 3}
1212
m_ShaderKeywords: _HASFLOWEFFECT_ON _HASMASK_ON _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON
13-
_VERTEXAOPACITY_ON
13+
_SWITCH_ALPHA_ON _VERTEXAOPACITY_ON
1414
m_LightmapFlags: 0
1515
m_EnableInstancingVariants: 0
1616
m_DoubleSidedGI: 0
@@ -48,6 +48,10 @@ Material:
4848
m_Texture: {fileID: 2800000, guid: 037eea83bb383c34ebc2ee292c903057, type: 3}
4949
m_Scale: {x: 1, y: 1}
5050
m_Offset: {x: 0, y: 0}
51+
- _MainTexture:
52+
m_Texture: {fileID: 2800000, guid: 6eb539aefcd5a7846af91c0a77161b92, type: 3}
53+
m_Scale: {x: 1, y: 1}
54+
m_Offset: {x: 0, y: 0}
5155
- _MetallicGlossMap:
5256
m_Texture: {fileID: 0}
5357
m_Scale: {x: 1, y: 1}
@@ -104,6 +108,7 @@ Material:
104108
- _SpecularHighlights: 1
105109
- _SrcBlend: 1
106110
- _StepSubtract: 1
111+
- _Switch_Alpha: 1
107112
- _UVSec: 0
108113
- _UseAlphaChannel: 0
109114
- _Use_alpha: 0

‎Assets/BossRoom/VFX/Materials/M_MotionFlash.mat‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Material:
1010
m_Name: M_MotionFlash
1111
m_Shader: {fileID: 4800000, guid: 19584968e8d53424c9ce71b2c72d64f4, type: 3}
1212
m_ShaderKeywords: _HASFLOWEFFECT_ON _HASMASK_ON _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON
13-
_VERTEXAOPACITY_ON
13+
_SWITCH_ALPHA_ON _VERTEXAOPACITY_ON
1414
m_LightmapFlags: 0
1515
m_EnableInstancingVariants: 0
1616
m_DoubleSidedGI: 0
@@ -48,6 +48,10 @@ Material:
4848
m_Texture: {fileID: 2800000, guid: 037eea83bb383c34ebc2ee292c903057, type: 3}
4949
m_Scale: {x: 1, y: 1}
5050
m_Offset: {x: 0, y: 0}
51+
- _MainTexture:
52+
m_Texture: {fileID: 2800000, guid: fa9d4375ce230e1488b5a2680fd71074, type: 3}
53+
m_Scale: {x: 1, y: 1}
54+
m_Offset: {x: 0, y: 0}
5155
- _MetallicGlossMap:
5256
m_Texture: {fileID: 0}
5357
m_Scale: {x: 1, y: 1}
@@ -104,6 +108,7 @@ Material:
104108
- _SpecularHighlights: 1
105109
- _SrcBlend: 1
106110
- _StepSubtract: 1
111+
- _Switch_Alpha: 1
107112
- _UVSec: 0
108113
- _UseAlphaChannel: 0
109114
- _Use_alpha: 0

‎Assets/BossRoom/VFX/Prefabs/Boss/Charge Attack/FX_Boss_Motion.prefab‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5723,7 +5723,7 @@ ParticleSystem:
57235723
m_PostInfinity: 2
57245724
m_RotationOrder: 4
57255725
EmissionModule:
5726-
enabled: 1
5726+
enabled: 0
57275727
serializedVersion: 4
57285728
rateOverTime:
57295729
serializedVersion: 2
@@ -14551,7 +14551,7 @@ GameObject:
1455114551
m_Icon: {fileID: 0}
1455214552
m_NavMeshLayer: 0
1455314553
m_StaticEditorFlags: 0
14554-
m_IsActive: 1
14554+
m_IsActive: 0
1455514555
--- !u!4 &2036539137060380902
1455614556
Transform:
1455714557
m_ObjectHideFlags: 0
@@ -24187,7 +24187,7 @@ GameObject:
2418724187
m_Icon: {fileID: 0}
2418824188
m_NavMeshLayer: 0
2418924189
m_StaticEditorFlags: 0
24190-
m_IsActive: 1
24190+
m_IsActive: 0
2419124191
--- !u!4 &2036539137724310654
2419224192
Transform:
2419324193
m_ObjectHideFlags: 0
@@ -34724,7 +34724,7 @@ ParticleSystem:
3472434724
m_PostInfinity: 2
3472534725
m_RotationOrder: 4
3472634726
EmissionModule:
34727-
enabled: 1
34727+
enabled: 0
3472834728
serializedVersion: 4
3472934729
rateOverTime:
3473034730
serializedVersion: 2

‎Assets/BossRoom/VFX/Prefabs/Torch/FX_Torch_Fire.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14577,7 +14577,7 @@ GameObject:
1457714577
m_Icon: {fileID: 0}
1457814578
m_NavMeshLayer: 0
1457914579
m_StaticEditorFlags: 0
14580-
m_IsActive: 1
14580+
m_IsActive: 0
1458114581
--- !u!4 &4624227725626333199
1458214582
Transform:
1458314583
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)