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

liuzhiwei

2020-11-06 f44ad64eff5c66b711e2b8d28c44c85a92cbc393

 Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs

@@ -54,6 +54,16 @@
            var agent = this.gameObject.GetComponent<Agent>();
            if (agent == null)
                return;
            
            BallisticProjectile ballistic = c.gameObject.GetComponent<BallisticProjectile>();

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

            ballistic.IsHitEnemy = true;

            LazyLoad();