Merge commit '67ee17292855d8ce2e077bea2f86113adadf839c'

wangguan

2020-12-17 adf42e9f9f0ea328e4cd3d3d8d63cc111f3f72a1

 Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs

@@ -52,23 +52,15 @@

            // 非Agent不参与碰撞:
            var agent = this.gameObject.GetComponent<Agent>();
            if (agent == null)
            if (agent == null || agent.isDead)
                return;
            

            BallisticProjectile ballistic = c.gameObject.GetComponent<BallisticProjectile>();

            if (ballistic.IsHitEnemy)
            {
                Debug.Log("--------------------- 已发生过碰撞 ---------------------");
                return;
            }

            ballistic.IsHitEnemy = true;

            LazyLoad();

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

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