Merge commit '67ee17292855d8ce2e077bea2f86113adadf839c'

wangguan

2020-12-17 adf42e9f9f0ea328e4cd3d3d8d63cc111f3f72a1

 Assets/Scripts/TowerDefense/Towers/TowerLevel.cs

@@ -83,6 +83,9 @@
        /// </summary>
        private float fireSpeed = 1f;

        [SerializeField]
        private SpriteRenderer levelBorder;

        /// <summary>
        /// 发射倍速，如果设置多倍速攻击，直接修改此属性，恢复之前的攻速直接设置为 1
        /// </summary>
@@ -150,7 +153,29 @@
        /// <param name="level">从1开始</param>
        public void SetShowLevel(int level)
        {
            elf_upgrade info = ElfUpgradeData.GetDataById(level);
            LevelText.text = $"{level}";
            levelBorder.sprite = Resources.Load<Sprite>($"UI/TowerLevel/{info.rank_img}");

            Vector3 pos = levelBorder.transform.localPosition;

            if (info.rank_img < 3)
                pos.z = ParentTower.ElfId == 201 ? 0.542f : 0.645f;
            else
                pos.z = ParentTower.ElfId == 201 ? 0.497f : 0.594f;

            levelBorder.transform.localPosition = pos;
        }

        /// <summary>
        /// 设置缩放
        /// </summary>
        /// <param name="level">从1开始</param>
        public void SetScale(int level)
        {
            elf_upgrade info = ElfUpgradeData.GetDataById(level);
            //Debug.Log($"level:{level}  设置了缩放:{info.zoom}");
            transform.localScale = Vector3.one * info.zoom;
        }

        private void Awake()