Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

chenxin

2020-11-25 554eda43e00d5817cd3e06a60e39d4bd882ee584

 Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs

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

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

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