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

liuzhiwei

2020-11-04 78e14d93c46238881339f33a56c81275c55d5089

 Assets/Scripts/TowerDefense/Agents/Agent.cs

@@ -852,11 +852,17 @@
        {
            if (this.healthVal <= 0.1)
            {
                // 统一管理器内删除当前的Agent:
                AgentInsManager.instance.removeAgent(this);
                this.Remove();
                Die();

                //Debug.Log("删除多余的攻击Agent.");
            }
        }

        private void Die()
        {
            // 统一管理器内删除当前的Agent:
            AgentInsManager.instance.removeAgent(this);
            this.Remove();
        }

        /// <summary>
@@ -997,7 +1003,7 @@
            if (mAnim == null)
            {
                changeMat = GetComponent<ChangeMat>();
                changeMat?.SetSelf(this.opponentAgent,CheckHealth);
                changeMat?.SetSelf(this.opponentAgent, CheckHealth,Die);
            }
        }