From d66fdae8a885ff6ab23bedd423f6eade1779365c Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Sat, 26 Dec 2020 18:00:08 +0800
Subject: [PATCH] 新手引导对话框以及JSON修改
---
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 175 ++++++++++++++++++++++++++++------------------------------
1 files changed, 84 insertions(+), 91 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index fb4c283..1252d66 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -15,7 +15,7 @@
/// </summary>
public class EndlessUIStart : Singleton<EndlessUIStart>
{
- public TextMeshProUGUI countDownTextNew = null;
+ //public TextMeshProUGUI countDownTextNew = null;
public TextMeshProUGUI timeTextNew = null;
@@ -62,12 +62,26 @@
protected override void Awake()
{
base.Awake();
+
+ if (Application.platform == RuntimePlatform.WindowsEditor ||
+ Application.platform == RuntimePlatform.WindowsPlayer)
+ {
+ GameConfig.useSDK = false;
+ GameConfig.OpenDebug = true;
+ GMBtn.SetActive(true);
+ }
+ else
+ {
+ GMBtn.SetActive(false);
+ }
//这里为了方便直接使用Endless2D
GameObject root = GameObject.Find("ManagerRoot");
if (root == null)
{
+
root = new GameObject("ManagerRoot");
+
root.AddComponent<DoNotDestory>();
root.AddComponent<MasterSocket>();
root.AddComponent<TDAA_SDKManager>();
@@ -87,6 +101,7 @@
InitSDK();
bGameStart = false;
bFirstLoaded = false;
+ GameConfig.IsUpgradeTowerLevel = false;
GameConfig.CreateRandomTower = true;
bVibrate = new bool[4];
@@ -140,12 +155,17 @@
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);
- GMBtn.SetActive(false);
+
GameConfig.EnergyCount = 0;
GameConfig.SkillLevel = 1;
@@ -166,7 +186,7 @@
int guide = PlayerPrefs.GetInt("GemBattleGuide");
GameConfig.IsNewbie = guide == 0;
- //GameConfig.IsNewbie = false;
+ //GameConfig.IsNewbie = true;
GameConfig.IsNewbieStart = GameConfig.IsNewbie;
@@ -178,13 +198,43 @@
GameConfig.CanDragTower = false;
Pause();
HideUIMask();
- countDownTextNew.text = "";
- countDownTextNew.gameObject.SetActive(false);
+ //countDownTextNew.text = "";
+ //countDownTextNew.gameObject.SetActive(false);
GameObject prefab = Resources.Load<GameObject>("UI/Guide/GuidePanel");
GameObject guideObj = Instantiate(prefab, transform.Find("Panel"));
guideObj.GetComponent<RectTransform>().offsetMin += tmpOffect;
AddGuideEvent();
+
}
+ else
+ {
+ //开始倒计时
+ StartCoroutine(StartCountDown());
+ }
+ }
+ public GameObject countDownPS;
+
+ IEnumerator StartCountDown()
+ {
+ countDownPS.SetActive(true);
+ //MMVibrationManager.Haptic(HapticTypes.MediumImpact);
+ yield return new WaitForSeconds(1.0f);
+ //MMVibrationManager.Haptic(HapticTypes.MediumImpact);
+ yield return new WaitForSeconds(1.0f);
+ //MMVibrationManager.Haptic(HapticTypes.MediumImpact);
+ yield return new WaitForSeconds(1.0f);
+ HideUIMask();
+ //countDownTextNew.text = "";
+ countDownPS.SetActive(false);
+ bGameStart = true;
+ // 开始关卡
+ EndlessLevelManager.instance.StartLevel();
+ timeTextNew.gameObject.SetActive(true);
+
+ JsonDataReadDone();
+ // 开始播放背景音乐.
+ if (bgMusic != null)
+ bgMusic.Play();
}
public void GameOver()
@@ -206,7 +256,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;
@@ -486,7 +537,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>
/// 点击火技能
@@ -539,14 +590,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);
+ if (skillPS3.activeSelf) skillPS3.SetActive(false);
+ //skillPS1.Play();
+ //skillPS2.Play();
}
else
{
@@ -555,8 +608,12 @@
{
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
@@ -566,8 +623,11 @@
{
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();
}
}
@@ -598,7 +658,7 @@
fireSkillCost = JsonDataCenter.GetSkillLevelInfo(fireSkillID, GameConfig.SkillLevel).cost;
bombSkillCost = JsonDataCenter.GetSkillLevelInfo(bombSkillID, GameConfig.SkillLevel).cost;
//Debug.Log($"技能最高5级,当前技能等级：{GameConfig.SkillLevel} fireSkillCost:{fireSkillCost} ");
- fireSkillLevelText.text = "Lv." + GameConfig.SkillLevel;
+ fireSkillLevelText.text = GameConfig.SkillLevel + "级";
}
}
@@ -640,84 +700,16 @@
{
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));
}
- if (!GameConfig.IsNewbie)
- {
- if (!bFirstLoaded && !bGameStart)
- {
- bFirstLoaded = true;
- secToDo = 4;
- }
-
- if (bFirstLoaded && !bGameStart)
- {
- secToDo -= Time.deltaTime;
- countDownTextNew.gameObject.SetActive(true);
-
- if (secToDo >= 3)
- {
- countDownTextNew.text = "3";
- if (!bVibrate[3])
- {
- bVibrate[3] = true;
- MMVibrationManager.Haptic(HapticTypes.SoftImpact);
- }
- }
- else if (secToDo >= 2)
- {
- countDownTextNew.text = "2";
- if (!bVibrate[2])
- {
- bVibrate[2] = true;
- MMVibrationManager.Haptic(HapticTypes.MediumImpact);
- }
- }
- else if (secToDo >= 1)
- {
- countDownTextNew.text = "1";
- if (!bVibrate[1])
- {
- bVibrate[1] = true;
- MMVibrationManager.Haptic(HapticTypes.HeavyImpact);
- }
- }
- else if (secToDo < 1)
- {
- countDownTextNew.text = "GO!";
- if (!bVibrate[0])
- {
- bVibrate[0] = true;
- MMVibrationManager.Haptic(HapticTypes.HeavyImpact);
- }
- }
-
- // 开启游戏，且隐藏中间的数字.
- if (secToDo <= 0)
- {
- HideUIMask();
- countDownTextNew.text = "";
- countDownTextNew.gameObject.SetActive(false);
- bGameStart = true;
- // 开始关卡
- EndlessLevelManager.instance.StartLevel();
- timeTextNew.gameObject.SetActive(true);
-
- JsonDataReadDone();
- // 开始播放背景音乐.
- if (bgMusic != null)
- bgMusic.Play();
- }
- }
- }
- else
+ if (GameConfig.IsNewbie)
{
// 新手走的流程
if (!bFirstLoaded && !bGameStart)
@@ -735,5 +727,6 @@
bgMusic.Play();
}
}
+
}
}
--
Gitblit v1.9.1