Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-14 16:27:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't apply explosion force 2 times

Browse source
This commit is contained in:
in0finite 2020-06-21 15:33:19 +02:00
parent aaf9af8c3f
commit 44fe30d8df
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assets/Prefabs/Explosion.prefab
View file

@ -23335,7 +23335,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0ac1691131a8c844dafe8b6ace6a172a, type: 3} m_Script: {fileID: 11500000, guid: 0ac1691131a8c844dafe8b6ace6a172a, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
explosionForce: 20 explosionForce: 500
upwardsModifier: 3
radius: 10
--- !u!114 &11400000 --- !u!114 &11400000
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

2
Assets/Scripts/Behaviours/Vehicles/Vehicle_Damage.cs
View file

@ -206,7 +206,7 @@ namespace SanAndreasUnity.Behaviours.Vehicles
rigidBody.mass = mass; rigidBody.mass = mass;
rigidBody.drag = 0.05f; rigidBody.drag = 0.05f;
rigidBody.maxDepenetrationVelocity = VehicleManager.Instance.explosionLeftoverPartsMaxDepenetrationVelocity; rigidBody.maxDepenetrationVelocity = VehicleManager.Instance.explosionLeftoverPartsMaxDepenetrationVelocity;
rigidBody.AddExplosionForce(explosionForce, explosionCenter, explosionRadius); //rigidBody.AddExplosionForce(explosionForce, explosionCenter, explosionRadius);
Object.Destroy(meshFilter.gameObject, VehicleManager.Instance.explosionLeftoverPartsLifetime * Random.Range(0.8f, 1.2f)); Object.Destroy(meshFilter.gameObject, VehicleManager.Instance.explosionLeftoverPartsLifetime * Random.Range(0.8f, 1.2f));
} }

2
Assets/UnityStandardAssets

@ -1 +1 @@
Subproject commit 2cfe2611ba93a0cd8f61e68f6989d8fa7f6357f0 Subproject commit e2abbfcf853f5c7b3a5fe891df0b08ffa396afd4