From 6d3bfdaad36f4af65494854e5651f7d37ad81d6b Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Sat, 12 Dec 2020 18:56:34 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index d465142..2400d53 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -87,6 +87,7 @@
InitSDK();
bGameStart = false;
bFirstLoaded = false;
+ GameConfig.IsUpgradeTowerLevel = false;
GameConfig.CreateRandomTower = true;
bVibrate = new bool[4];
@@ -140,8 +141,11 @@
skillSliderVStartP = skillSliderValueRect.anchoredPosition;
skillSliderVStartHeight = skillSliderValueRect.sizeDelta;
- skillPS1 = transform.Find("Panel/Energy/FireSkillBg/Effect_UI_JiNengTuBiao/03").GetComponent<ParticleSystem>();
- skillPS2 = transform.Find("Panel/Energy/FireSkillBg/Effect_UI_JiNengTuBiao_02/03").GetComponent<ParticleSystem>();
+ skillPS1 = transform.Find("Panel/Energy/FireSkillBg/Effect_UI_JiNengTuBiao/03").gameObject;
+ skillPS2 = transform.Find("Panel/Energy/FireSkillBg/Effect_UI_JiNengTuBiao_02/03").gameObject;
+
+ skillPS1.SetActive(false);
+ skillPS2.SetActive(false);
transform.Find("Panel/BuffPreviewButton").gameObject.SetActive(false);
transform.Find("Panel/SwitchSpeed").gameObject.SetActive(false);
@@ -166,12 +170,14 @@
int guide = PlayerPrefs.GetInt("GemBattleGuide");
GameConfig.IsNewbie = guide == 0;
- //GameConfig.IsNewbie = false;
+ //GameConfig.IsNewbie = true;
GameConfig.IsNewbieStart = GameConfig.IsNewbie;
if (GameConfig.IsNewbie)
{
+ EndlessRandomTower.instance.SetCountDown(false);
+
Debug.Log("开始新手引导");
GameConfig.CanDragTower = false;
Pause();
@@ -484,7 +490,7 @@
private Color disColor = new Color(1.0f, 1.0f, 1.0f, 0);
private Text fireSkillLevelText;
private Image fireSkillBgImg;
- private ParticleSystem skillPS1, skillPS2;
+ private GameObject skillPS1, skillPS2;
/// <summary>
/// 点击火技能
@@ -537,14 +543,16 @@
{
if (GameConfig.EnergyCount == energyMax)
{
-
//Debug.Log("能量已满");
if (fireSkillBgImg.color != disColor)
{
fireSkillBgImg.color = disColor;
}
- skillPS1.Play();
- skillPS2.Play();
+ if (!skillPS1.activeSelf) skillPS1.SetActive(true);
+ if (!skillPS2.activeSelf) skillPS2.SetActive(true);
+
+ //skillPS1.Play();
+ //skillPS2.Play();
}
else
{
@@ -553,18 +561,23 @@
{
fireSkillBgImg.color = normalColor;
}
- if (skillPS1.isPlaying) skillPS1.Stop();
- if (!skillPS2.isPlaying) skillPS2.Play();
+ if (skillPS1.activeSelf) skillPS1.SetActive(false);
+ if (!skillPS2.activeSelf) skillPS2.SetActive(true);
+ //if (skillPS1.isPlaying) skillPS1.Stop();
+ //if (!skillPS2.isPlaying) skillPS2.Play();
}
}
else
{
+ //Debug.Log("能量不够");
if (fireSkillBgImg.color != normalColor)
{
fireSkillBgImg.color = normalColor;
}
- if (skillPS1.isPlaying) skillPS1.Stop();
- if (skillPS2.isPlaying) skillPS2.Stop();
+ if (skillPS1.activeSelf) skillPS1.SetActive(false);
+ if (skillPS2.activeSelf) skillPS2.SetActive(false);
+ // if (skillPS1.isPlaying) skillPS1.Stop();
+ // if (skillPS2.isPlaying) skillPS2.Stop();
}
}
@@ -637,11 +650,11 @@
{
startTime += Time.deltaTime;
- if (!isUpgradeTowerLevel && startTime >= JsonDataCenter.DOUBLE_GEM_TIME)
- {
- EndlessRandomTower.instance.UpdateDescDisplay();
- isUpgradeTowerLevel = true;
- }
+ // if (!isUpgradeTowerLevel && startTime >= JsonDataCenter.DOUBLE_GEM_TIME)
+ // {
+ // EndlessRandomTower.instance.UpdateDescDisplay();
+ // isUpgradeTowerLevel = true;
+ // }
timeTextNew.text = ConvertTime((float)Math.Ceiling(startTime));
}
--
Gitblit v1.9.1