From 7b9712f33f42b14e4d277166fa533a379021312d Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 18 Dec 2020 09:52:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index a4ee0d5..496e1e2 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -67,20 +67,20 @@
if (root == null)
{
- if (Application.platform == RuntimePlatform.WindowsEditor ||
- Application.platform == RuntimePlatform.WindowsPlayer)
- {
- GameConfig.useSDK = false;
- }
+ if (Application.platform == RuntimePlatform.WindowsEditor ||
+ Application.platform == RuntimePlatform.WindowsPlayer)
+ {
+ GameConfig.useSDK = false;
+ }
- root = new GameObject("ManagerRoot");
+ root = new GameObject("ManagerRoot");
- root.AddComponent<DoNotDestory>();
- root.AddComponent<MasterSocket>();
- root.AddComponent<TDAA_SDKManager>();
- root.AddComponent<AudioSourceManager>();
- root.AddComponent<JsonDataReader>();
- root.AddComponent<JsonDataInit>();
+ root.AddComponent<DoNotDestory>();
+ root.AddComponent<MasterSocket>();
+ root.AddComponent<TDAA_SDKManager>();
+ root.AddComponent<AudioSourceManager>();
+ root.AddComponent<JsonDataReader>();
+ root.AddComponent<JsonDataInit>();
}
firstStart = true;
//EventCenter.Ins.Add((int)KTGMGemClient.EventType.JsonDataReadDone, JsonDataReadDone);
@@ -150,9 +150,11 @@
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);
@@ -498,7 +500,7 @@
private Color disColor = new Color(1.0f, 1.0f, 1.0f, 0);
private Text fireSkillLevelText;
private Image fireSkillBgImg;
- private GameObject skillPS1, skillPS2;
+ private GameObject skillPS1, skillPS2, skillPS3;
/// <summary>
/// 点击火技能
@@ -558,7 +560,7 @@
}
if (!skillPS1.activeSelf) skillPS1.SetActive(true);
if (!skillPS2.activeSelf) skillPS2.SetActive(true);
-
+ if (skillPS3.activeSelf) skillPS3.SetActive(false);
//skillPS1.Play();
//skillPS2.Play();
}
@@ -571,6 +573,8 @@
}
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();
}
@@ -584,6 +588,7 @@
}
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();
--
Gitblit v1.9.1