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

liuzhiwei

2020-11-04 78e14d93c46238881339f33a56c81275c55d5089

 Assets/Scripts/TowerDefense/Towers/TowerLevel.cs

@@ -122,6 +122,7 @@
            get { return levelData.upgradeDescription; }
        }


        /// <summary>
        /// Initialises the Effects attached to this object
        /// </summary>
@@ -137,6 +138,61 @@
            m_ParentTower = tower;
        }

        private Transform mat;
        Vector3 normalScale;

        private Vector3 fireScale = new Vector3(1.6f, 1.6f, 1.84f);
        private Vector3 woodScale = new Vector3(1.0f, 1.0f, 1.88f);
        private Vector3 waterScale = new Vector3(1.0f, 1.0f, 1.88f);

        private void Awake()
        {
            mat = transform.Find("Cube");
            normalScale = new Vector3(1.5f, 1.5f, 1.5f);
        }

        /// <summary>
        /// 未上阵塔缩放，固定缩放
        /// </summary>
        public void NormalScale()
        {
            mat.localScale = normalScale;
        }

        /// <summary>
        /// 上阵塔缩放
        /// </summary>
        public void ResetScale()
        {
            if (transform.name.StartsWith("GrowUpTower"))
            {
                //火元素
                mat.localScale = fireScale;
            }
            else if (transform.name.StartsWith("BlinkTower"))
            {
                //木元素
                mat.localScale = woodScale;
            }
            else if (transform.name.StartsWith("CopyCatTower"))
            {
                //水元素
                //mat.localScale = woodScale;

                Vector3 scale = mat.localScale;

                if (!this.bScaleForCombat)
                {
                    scale.z *= 1.267f;
                    mat.localScale = scale;
                    Vector3 pos = mat.localPosition;
                    pos.z -= 0.2f;
                    mat.localPosition = pos;
                    bScaleForCombat = true;
                }
            }
        }

        /// <summary>
        /// 当前的TowerLevel设置为对应怪物的材质显示
        /// </summary>
@@ -150,17 +206,17 @@
                if (t.name == "Cube")
                {
                    t.GetComponent<MeshRenderer>().material = mat;
                    Vector3 scale = t.localScale;
                    //Vector3 scale = t.localScale;

                    if (!this.bScaleForCombat)
                    {
                        scale.z *= 1.267f;
                        t.localScale = scale;
                        Vector3 pos = t.localPosition;
                        pos.z -= 0.2f;
                        t.localPosition = pos;
                        bScaleForCombat = true;
                    }
                    // if (!this.bScaleForCombat)
                    // {
                    //     scale.z *= 1.267f;
                    //     t.localScale = scale;
                    //     Vector3 pos = t.localPosition;
                    //     pos.z -= 0.2f;
                    //     t.localPosition = pos;
                    //     bScaleForCombat = true;
                    // }
                }
            }
        }
@@ -244,7 +300,7 @@
        /// </summary>
        void Start()
        {
            

        }

        /// <summary>