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

liuzhiwei

2020-11-12 18f96c9313bf24d2296e615f44fc0ca005f2e872

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