From adb0dae8a82a7eabb4e686bc0e83c8859bf6445f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 25 Dec 2020 10:48:53 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Towers/TowerLevel.cs | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Towers/TowerLevel.cs b/Assets/Scripts/TowerDefense/Towers/TowerLevel.cs
index fdae3fb..d2e4427 100644
--- a/Assets/Scripts/TowerDefense/Towers/TowerLevel.cs
+++ b/Assets/Scripts/TowerDefense/Towers/TowerLevel.cs
@@ -86,6 +86,8 @@
[SerializeField]
private SpriteRenderer levelBorder;
+ [SerializeField]
+ private ParticleSystem buffPS;
/// <summary>
/// 发射倍速，如果设置多倍速攻击，直接修改此属性，恢复之前的攻速直接设置为 1
/// </summary>
@@ -147,24 +149,33 @@
ElfInfo = ElfInfoData.GetDataById(tower.ElfId);
}
+ [SerializeField]
+ private Sprite[] sprites;
/// <summary>
/// 设置显示等级
/// </summary>
/// <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}");
+ LevelText.text = level < 5 ? "" : level.ToString();
+ levelBorder.sprite = level < 5 ? sprites[level - 1] : sprites[4];
+ // elf_upgrade info = ElfUpgradeData.GetDataById(level);
+ // LevelText.text = $"{level}";
+ // levelBorder.sprite = Resources.Load<Sprite>($"UI/TowerLevel/{info.rank_img}");
- Vector3 pos = levelBorder.transform.localPosition;
+ // 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;
+ // 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;
+ // levelBorder.transform.localPosition = pos;
+ }
+ //buff生效
+ public void ShowBuffPS()
+ {
+ buffPS?.Play();
}
/// <summary>
--
Gitblit v1.9.1