diff --git a/Assets/1-Packs/Effects/Hovl Studio/Magic effects pack/Materials/Electro.mat b/Assets/1-Packs/Effects/Hovl Studio/Magic effects pack/Materials/Electro.mat index b95a2708..862f4933 100644 --- a/Assets/1-Packs/Effects/Hovl Studio/Magic effects pack/Materials/Electro.mat +++ b/Assets/1-Packs/Effects/Hovl Studio/Magic effects pack/Materials/Electro.mat @@ -19,11 +19,13 @@ Material: m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: - RenderType: Opaque + RenderType: Transparent disabledShaderPasses: - GRABPASS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -86,8 +88,8 @@ Material: - _DistortionEnabled: 0 - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -105,16 +107,16 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _BaseColor: {r: 6.347921, g: 6.347921, b: 6.347921, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 6.3479214, g: 6.3479214, b: 6.3479214, a: 1} - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Scripts/AbilitySystem/Effects/RefactoredStatusEffectHandler/DamageTickingRuntimeEffectInstance.cs b/Assets/Scripts/AbilitySystem/Effects/RefactoredStatusEffectHandler/DamageTickingRuntimeEffectInstance.cs index b9a8401a..59b412c0 100644 --- a/Assets/Scripts/AbilitySystem/Effects/RefactoredStatusEffectHandler/DamageTickingRuntimeEffectInstance.cs +++ b/Assets/Scripts/AbilitySystem/Effects/RefactoredStatusEffectHandler/DamageTickingRuntimeEffectInstance.cs @@ -39,7 +39,8 @@ public class DamageTickingRuntimeEffectInstance : TickingRuntimeEffectInstance user.Broker.OnOutgoingDamageProcessed.Invoke(args); - targetHealth.ApplyDamage(args); + if (targetHealth != null) + targetHealth.ApplyDamage(args); CObjectPool.Release(args); }