Skip to content

Temporary update to shader S_SimpleDissolve and corresponding FX. #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2021
Merged

Temporary update to shader S_SimpleDissolve and corresponding FX. #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Assets/BossRoom/VFX/Materials/FX_M_GroundCrack.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 79ffdab583577334cb184c42218dce5f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: 79ffdab583577334cb184c42218dce5f, 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}
Expand Down Expand Up @@ -95,6 +99,7 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StepSubtract: 1
- _Switch_Alpha: 0
- _UVSec: 0
- _UseAlphaChannel: 0
- _VertexAOpacity: 1
Expand Down
5 changes: 5 additions & 0 deletions Assets/BossRoom/VFX/Materials/FX_M_GroundCrack_2.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 34a4d61e192b21a4bb3ab13482c439d7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: 34a4d61e192b21a4bb3ab13482c439d7, 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}
Expand Down Expand Up @@ -95,6 +99,7 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StepSubtract: 1
- _Switch_Alpha: 0
- _UVSec: 0
- _UseAlphaChannel: 0
- _VertexAOpacity: 1
Expand Down
7 changes: 6 additions & 1 deletion Assets/BossRoom/VFX/Materials/FX_M_StylizeSmoke.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Material:
m_Name: FX_M_StylizeSmoke
m_Shader: {fileID: 4800000, guid: 19584968e8d53424c9ce71b2c72d64f4, type: 3}
m_ShaderKeywords: _HASDYNAMICDISSOLVE_ON _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON
_VERTEXAOPACITY_ON
_SWITCH_ALPHA_ON _VERTEXAOPACITY_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -48,6 +48,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 1ee97322756ea2c489f9311bd5c9f72d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: fa9d4375ce230e1488b5a2680fd71074, type: 3}
m_Scale: {x: 1, y: 2}
m_Offset: {x: -0.25, y: -0.25}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand Down Expand Up @@ -88,6 +92,7 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StepSubtract: 1
- _Switch_Alpha: 1
- _UVSec: 0
- _UseAlphaChannel: 0
- _VertexAOpacity: 1
Expand Down
7 changes: 6 additions & 1 deletion Assets/BossRoom/VFX/Materials/FX_M_Stylize_Smoke_falldown.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: FX_M_Stylize_Smoke_falldown
m_Shader: {fileID: 4800000, guid: 19584968e8d53424c9ce71b2c72d64f4, type: 3}
m_ShaderKeywords: _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON _VERTEXAOPACITY_ON
m_ShaderKeywords: _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON _SWITCH_ALPHA_ON _VERTEXAOPACITY_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -47,6 +47,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 1ee97322756ea2c489f9311bd5c9f72d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: cc5ee705b0abdca40b904a2b89a38d8b, 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}
Expand Down Expand Up @@ -87,6 +91,7 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StepSubtract: 1
- _Switch_Alpha: 1
- _UVSec: 0
- _UseAlphaChannel: 0
- _VertexAOpacity: 1
Expand Down
7 changes: 6 additions & 1 deletion Assets/BossRoom/VFX/Materials/FX_MaskedPanner.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Material:
m_Name: FX_MaskedPanner
m_Shader: {fileID: 4800000, guid: 19584968e8d53424c9ce71b2c72d64f4, type: 3}
m_ShaderKeywords: _HASFLOWEFFECT_ON _HASMASK_ON _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON
_VERTEXAOPACITY_ON
_SWITCH_ALPHA_ON _VERTEXAOPACITY_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -48,6 +48,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 037eea83bb383c34ebc2ee292c903057, 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}
Expand Down Expand Up @@ -104,6 +108,7 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StepSubtract: 1
- _Switch_Alpha: 1
- _UVSec: 0
- _UseAlphaChannel: 0
- _Use_alpha: 0
Expand Down
7 changes: 6 additions & 1 deletion Assets/BossRoom/VFX/Materials/M_MotionFlash.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Material:
m_Name: M_MotionFlash
m_Shader: {fileID: 4800000, guid: 19584968e8d53424c9ce71b2c72d64f4, type: 3}
m_ShaderKeywords: _HASFLOWEFFECT_ON _HASMASK_ON _HASTEXTUREDISSOLVE_ON _STEPSUBTRACT_ON
_VERTEXAOPACITY_ON
_SWITCH_ALPHA_ON _VERTEXAOPACITY_ON
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -48,6 +48,10 @@ Material:
m_Texture: {fileID: 2800000, guid: 037eea83bb383c34ebc2ee292c903057, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexture:
m_Texture: {fileID: 2800000, guid: fa9d4375ce230e1488b5a2680fd71074, 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}
Expand Down Expand Up @@ -104,6 +108,7 @@ Material:
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StepSubtract: 1
- _Switch_Alpha: 1
- _UVSec: 0
- _UseAlphaChannel: 0
- _Use_alpha: 0
Expand Down
8 changes: 4 additions & 4 deletions Assets/BossRoom/VFX/Prefabs/Boss/Charge Attack/FX_Boss_Motion.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5723,7 +5723,7 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
EmissionModule:
enabled: 1
enabled: 0
serializedVersion: 4
rateOverTime:
serializedVersion: 2
Expand Down Expand Up @@ -14551,7 +14551,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &2036539137060380902
Transform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -24187,7 +24187,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &2036539137724310654
Transform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -34724,7 +34724,7 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
EmissionModule:
enabled: 1
enabled: 0
serializedVersion: 4
rateOverTime:
serializedVersion: 2
Expand Down
2 changes: 1 addition & 1 deletion Assets/BossRoom/VFX/Prefabs/Torch/FX_Torch_Fire.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14577,7 +14577,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &4624227725626333199
Transform:
m_ObjectHideFlags: 0
Expand Down
Loading