From dcbbe82ceca921e73e1789ae87ea8ac6a59c7bff Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Thu, 17 Dec 2020 15:54:41 +0800
Subject: [PATCH] 增加技能特效
---
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 71 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 16 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index 0a08e18..496e1e2 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -67,7 +67,14 @@
if (root == null)
{
+ if (Application.platform == RuntimePlatform.WindowsEditor ||
+ Application.platform == RuntimePlatform.WindowsPlayer)
+ {
+ GameConfig.useSDK = false;
+ }
+
root = new GameObject("ManagerRoot");
+
root.AddComponent<DoNotDestory>();
root.AddComponent<MasterSocket>();
root.AddComponent<TDAA_SDKManager>();
@@ -87,6 +94,7 @@
InitSDK();
bGameStart = false;
bFirstLoaded = false;
+ GameConfig.IsUpgradeTowerLevel = false;
GameConfig.CreateRandomTower = true;
bVibrate = new bool[4];
@@ -140,8 +148,13 @@
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;
+ skillPS3 = transform.Find("Panel/Energy/FireSkillBg/Effect_UI_JiNengTuBiao_03/03 (8)").gameObject;
+
+ skillPS1.SetActive(false);
+ skillPS2.SetActive(false);
+ skillPS3.SetActive(false);
transform.Find("Panel/BuffPreviewButton").gameObject.SetActive(false);
transform.Find("Panel/SwitchSpeed").gameObject.SetActive(false);
@@ -166,20 +179,22 @@
int guide = PlayerPrefs.GetInt("GemBattleGuide");
GameConfig.IsNewbie = guide == 0;
- GameConfig.IsNewbie = true;
+ //GameConfig.IsNewbie = true;
GameConfig.IsNewbieStart = GameConfig.IsNewbie;
if (GameConfig.IsNewbie)
{
+ EndlessRandomTower.instance.SetCountDown(false);
+
Debug.Log("开始新手引导");
GameConfig.CanDragTower = false;
Pause();
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();
}
@@ -204,7 +219,8 @@
{
transform.Find("Panel/BuffPreviewButton").gameObject.SetActive(true);
transform.Find("Panel/SwitchSpeed").gameObject.SetActive(true);
- GMBtn.SetActive(true);
+ // cx test
+ // GMBtn.SetActive(true);
}
fireSkillCost = JsonDataCenter.GetSkillLevelInfo(fireSkillID, GameConfig.SkillLevel).cost;
@@ -484,7 +500,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, skillPS3;
/// <summary>
/// 点击火技能
@@ -508,6 +524,10 @@
EndlessWaveLineManager.instance.PlayAllWaveLineEffect();
AgentInsManager.instance.ExecAllWavelineAttack(fireSkillID, GameConfig.SkillLevel, false);
++GameConfig.EndlessPortUseSkillTowerCount;
+ }
+ else
+ {
+ AudioSourceManager.Ins.Play(AudioEnum.UIDisable);
}
}
@@ -533,34 +553,44 @@
{
if (GameConfig.EnergyCount == energyMax)
{
-
- Debug.Log("能量已满");
+ //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);
+ if (skillPS3.activeSelf) skillPS3.SetActive(false);
+ //skillPS1.Play();
+ //skillPS2.Play();
}
else
{
- Debug.Log("能量达到一次使用");
+ //Debug.Log("能量达到一次使用");
if (fireSkillBgImg.color != normalColor)
{
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 (!skillPS3.activeSelf) skillPS3.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 (skillPS3.activeSelf) skillPS3.SetActive(false);
+ // if (skillPS1.isPlaying) skillPS1.Stop();
+ // if (skillPS2.isPlaying) skillPS2.Stop();
}
}
@@ -612,6 +642,8 @@
public bool IsGameRunning { get { return !isPause; } }
+ private bool isUpgradeTowerLevel;
+
// Update is called once per frame
void Update()
{
@@ -630,6 +662,13 @@
if (bGameStart)
{
startTime += Time.deltaTime;
+
+ // if (!isUpgradeTowerLevel && startTime >= JsonDataCenter.DOUBLE_GEM_TIME)
+ // {
+ // EndlessRandomTower.instance.UpdateDescDisplay();
+ // isUpgradeTowerLevel = true;
+ // }
+
timeTextNew.text = ConvertTime((float)Math.Ceiling(startTime));
}
--
Gitblit v1.9.1