pedrogomes/RiftMayhem
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix null targets on dots before cleanup

Browse Source
This commit is contained in:
Pedro Gomes 2025-10-01 22:26:52 +01:00
parent 2b0a985fc1
commit 04e40a5fbb
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/1-Packs/Effects/Hovl Studio/Magic effects pack/Materials/Electro.mat
View File

@ -19,11 +19,13 @@ Material:
m_LightmapFlags: 0 m_LightmapFlags: 0
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1 m_DoubleSidedGI: 1
m_CustomRenderQueue: -1 m_CustomRenderQueue: 3000
stringTagMap: stringTagMap:
RenderType: Opaque RenderType: Transparent
disabledShaderPasses: disabledShaderPasses:
- GRABPASS - GRABPASS
- DepthOnly
- SHADOWCASTER
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
@ -86,8 +88,8 @@ Material:
- _DistortionEnabled: 0 - _DistortionEnabled: 0
- _DistortionStrength: 1 - _DistortionStrength: 1
- _DistortionStrengthScaled: 0 - _DistortionStrengthScaled: 0
- _DstBlend: 0 - _DstBlend: 10
- _DstBlendAlpha: 0 - _DstBlendAlpha: 10
- _EmissionEnabled: 0 - _EmissionEnabled: 0
- _FlipbookBlending: 0 - _FlipbookBlending: 0
- _FlipbookMode: 0 - _FlipbookMode: 0
@ -105,16 +107,16 @@ Material:
- _SoftParticlesFarFadeDistance: 1 - _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0 - _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 5
- _SrcBlendAlpha: 1 - _SrcBlendAlpha: 1
- _Surface: 1 - _Surface: 1
- _UVSec: 0 - _UVSec: 0
- _ZWrite: 1 - _ZWrite: 0
m_Colors: m_Colors:
- _BaseColor: {r: 6.347921, g: 6.347921, b: 6.347921, a: 1} - _BaseColor: {r: 6.347921, g: 6.347921, b: 6.347921, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: Infinity, 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} - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}

1
Assets/Scripts/AbilitySystem/Effects/RefactoredStatusEffectHandler/DamageTickingRuntimeEffectInstance.cs
View File

@ -39,6 +39,7 @@ public class DamageTickingRuntimeEffectInstance : TickingRuntimeEffectInstance
user.Broker.OnOutgoingDamageProcessed.Invoke(args); user.Broker.OnOutgoingDamageProcessed.Invoke(args);
if (targetHealth != null)
targetHealth.ApplyDamage(args); targetHealth.ApplyDamage(args);
CObjectPool<DamageArgs>.Release(args); CObjectPool<DamageArgs>.Release(args);