Merge commit 'f2f4e1e45981bb294a5221ade7b4646cc3e29d35' into master

chenxin

2020-11-11 515d6439e79793dc903b249cfeb8fc2f217f2e4e

 Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs

@@ -52,18 +52,10 @@

            // 非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();