From 7fcfe2b029ffad2c35630d411d283c95ada7df5f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 09 Dec 2020 17:43:15 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index e9055c5..9aea232 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -166,6 +166,8 @@
int guide = PlayerPrefs.GetInt("GemBattleGuide");
GameConfig.IsNewbie = guide == 0;
+ //GameConfig.IsNewbie = true;
+
GameConfig.IsNewbieStart = GameConfig.IsNewbie;
if (GameConfig.IsNewbie)
@@ -176,8 +178,8 @@
HideUIMask();
countDownTextNew.text = "";
countDownTextNew.gameObject.SetActive(false);
- //GameObject go = Resources.Load<GameObject>("UI/Guide/GuidePanel");
- GameObject guideObj = Instantiate(Resources.Load<GameObject>("UI/Guide/GuidePanel"), transform.Find("Panel"));
+ GameObject prefab = Resources.Load<GameObject>("UI/Guide/GuidePanel");
+ GameObject guideObj = Instantiate(prefab, transform.Find("Panel"));
guideObj.GetComponent<RectTransform>().offsetMin += tmpOffect;
AddGuideEvent();
}
@@ -532,7 +534,7 @@
if (GameConfig.EnergyCount == energyMax)
{
- Debug.Log("能量已满");
+ //Debug.Log("能量已满");
if (fireSkillBgImg.color != disColor)
{
fireSkillBgImg.color = disColor;
@@ -542,7 +544,7 @@
}
else
{
- Debug.Log("能量达到一次使用");
+ //Debug.Log("能量达到一次使用");
if (fireSkillBgImg.color != normalColor)
{
fireSkillBgImg.color = normalColor;
@@ -610,6 +612,8 @@
public bool IsGameRunning { get { return !isPause; } }
+ private bool isUpgradeTowerLevel;
+
// Update is called once per frame
void Update()
{
@@ -628,6 +632,14 @@
if (bGameStart)
{
startTime += Time.deltaTime;
+
+ if (!isUpgradeTowerLevel && startTime >= JsonDataCenter.DOUBLE_GEM_TIME)
+ {
+ EndlessGameUI.instance.UpgradeAllTowerMinLevel(1);
+ EndlessRandomTower.instance.UpdateDescDisplay();
+ isUpgradeTowerLevel = true;
+ }
+
timeTextNew.text = ConvertTime((float)Math.Ceiling(startTime));
}
--
Gitblit v1.9.1