From a1f0653ec48d7787e0d57cabef0600b2a07355eb Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Sat, 31 Oct 2020 17:03:14 +0800
Subject: [PATCH] 解决冲突
---
Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs b/Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs
index 7d03af3..10feb0a 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs
@@ -30,17 +30,10 @@
private string path = "UI/Endless/Blood/";
- private string bossPath = "UI/Endless/Boss/";
-
/// <summary>
/// 血条底图
/// </summary>
public Sprite BaseBlood;
-
- /// <summary>
- /// 当前的进度值
- /// </summary>
- private float current;
/// <summary>
/// 目标进度值
@@ -109,7 +102,6 @@
/// </summary>
private void ResetProgress()
{
- current = 1f;
target = 1f;
HPImage1.fillAmount = 1;
HPImage2.fillAmount = 1;
@@ -207,8 +199,8 @@
public void SetBossImage(int resId)
{
resId = (resId + 1) % 2 + 1;
- BossImage.sprite = Resources.Load<Sprite>($"{bossPath}{resId}");
- BossImage.SetNativeSize();
+ // BossImage.sprite = Resources.Load<Sprite>($"{bossPath}{resId}");
+ // BossImage.SetNativeSize();
}
}
}
\ No newline at end of file
--
Gitblit v1.9.1