Merge commit '67ee17292855d8ce2e077bea2f86113adadf839c'

wangguan

2020-12-17 adf42e9f9f0ea328e4cd3d3d8d63cc111f3f72a1

 Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs

@@ -60,7 +60,7 @@
            LazyLoad();

            BallisticAttack ballisticAttack = damager.GetComponent<BallisticAttack>();
            ballisticAttack.DealDamage((Targetable)damageableBehaviour, ballisticAttack.attributeId, damager.IsEnhancedBullet);
            ballisticAttack.DealDamage((Targetable)damageableBehaviour, damager.IsEnhancedBullet);

            damager.HasDamaged(c.transform.position, damageableBehaviour.configuration.alignmentProvider);
        }