From 69e0fea6c92fd4e153d45e5f26ef89baecf0405a Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 19 Nov 2020 08:51:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs | 35 ++++-------------------------------
1 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs b/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
index 6305c3e..554cd95 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
@@ -89,7 +89,7 @@
int minLevel = EndlessGameUI.instance.MinLevel;
NormalDesc.text = $"购买{minLevel + 1}级宝石";
- SkillDesc.text = $"购买{minLevel + 1}级技能宝石";
+ //SkillDesc.text = $"购买{minLevel + 1}级技能宝石";
}
public void ChangeBtnClickNormal()
@@ -119,33 +119,6 @@
public List<Tower> towerList
{
get { return this.towerArray; }
- }
-
- /// <summary>
- /// 处理按钮升级相关.
- /// </summary>
- private void Update()
- {
- float gstime = EndlessUIStart.instance.GameStartTime;
- if (gstime <= 0) return;
-
- if ((!bCdTimeStart) && (LEVELUP_TOWER_TIME - gstime) <= JsonDataCenter.TOWERLVLUP_CDTIME)
- {
- bCdTimeStart = true;
- btnLvlUpCdTime = LEVELUP_TOWER_TIME - gstime;
- }
- if ((!bSetBuyLvlUp) && (gstime > LEVELUP_TOWER_TIME))
- {
- bSetBuyLvlUp = true;
- this.randomBtn.GetComponent<Image>().sprite = buyBtnLevelUp;
- }
-
- // 更新倒计时：
- if ((!bSetBuyLvlUp) && bCdTimeStart)
- {
- btnLvlUpCdTime -= Time.deltaTime;
- string distr = ((int)Math.Ceiling(btnLvlUpCdTime)).ToString() + "s";
- }
}
public void actionTest()
@@ -315,10 +288,10 @@
if (gameUI.isBuilding)
gameUI.CancelGhostPlacement();
- // if (level == -1)
- // level = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);
+ if (level == -1)
+ level = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);
- return gameUI.RandomPlaceTower(tower, posx, posy, 3, cost, false, isFirstAppear);
+ return gameUI.RandomPlaceTower(tower, posx, posy, level, cost, false, isFirstAppear);
}
/// <summary>
--
Gitblit v1.9.1