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

liuzhiwei

2020-12-26 56d95fa59a9f6dc12d0fc0723ea449e5b317f994

 Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs

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

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

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