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

chenxin

2020-11-25 554eda43e00d5817cd3e06a60e39d4bd882ee584

 Assets/Scripts/TowerDefense/Towers/TowerLevel.cs

@@ -66,6 +66,11 @@
        public GameObject AttackBody;

        /// <summary>
        /// 可以放置的材质
        /// </summary>
        public MeshRenderer canPlaceMesh;

        /// <summary>
        /// 精灵塔动作状态
        /// </summary>
        public TowerActionState ActionState { get; protected set; }
@@ -219,6 +224,7 @@
            mat = transform.Find("Cube");
            myRender = mat.GetComponent<MeshRenderer>();
            normalScale = new Vector3(1.5f, 1.5f, 1.5f);
            canPlaceMesh.enabled = false;
        }

        private void Start()
@@ -259,6 +265,16 @@
                ChangeState(TowerActionState.Standing);
        }

        /// <summary>
        /// 设置可以放置
        /// </summary>
        /// <param name="isOn"></param>
        public void SetCanPlace(bool isOn)
        {
            if (canPlaceMesh.enabled != isOn)
                canPlaceMesh.enabled = isOn;
        }
        
        public void ChangeState(TowerActionState state)
        {
            if (ActionAnimator == null || !ActionAnimator.isActiveAndEnabled) return;