From 3aaec4cb899faec0d6d3b70b81e9c2aad18346e8 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Tue, 27 Oct 2020 14:33:36 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle
---
Assets/Scripts/TowerDefense/UI/BulletUICtl.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/BulletUICtl.cs b/Assets/Scripts/TowerDefense/UI/BulletUICtl.cs
index 114c314..0424684 100644
--- a/Assets/Scripts/TowerDefense/UI/BulletUICtl.cs
+++ b/Assets/Scripts/TowerDefense/UI/BulletUICtl.cs
@@ -1,4 +1,5 @@
using DG.Tweening;
+using Protobuf;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -31,10 +32,11 @@
/// </summary>
public void resetToMaxBullet()
{
+ if (this.curBulletNum == maxBulletNum) return;
+
this.curBulletNum = maxBulletNum;
this.updateBulletUI(curBulletNum, maxBulletNum);
}
-
/// <summary>
/// 减少子弹，返回减少后的子弹数目。
@@ -57,7 +59,7 @@
{
if (bulletScaleMask == null) return;
float scaleY = 1.0f - curBNum / (float)totalBNum - fAdjValue;
- bulletScaleMask.rectTransform.DOScaleY( scaleY, 0.1f);
+ bulletScaleMask.rectTransform.DOScaleY( scaleY, 0.0f);
}
// Update is called once per frame
--
Gitblit v1.9.1