From 18f96c9313bf24d2296e615f44fc0ca005f2e872 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 12 Nov 2020 16:05:44 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index 06fb925..7b65c0c 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -56,6 +56,8 @@
{
InitSDK();
+ bGameStart = false;
+ bFirstLoaded = false;
darkGroundImg = transform.Find("Image_DarkGround").gameObject;
darkGroundImg.SetActive(false);
bVibrate = new bool[4];
@@ -69,6 +71,7 @@
SettlementUI.SetActive(false);
EndlessMaskUI.instance.Hide();
EndlessBossHPManager.instance.HideHP();
+ EndlessScoreManager.instance.HideScore();
//查询是否已经做过了新手引导
int guide = PlayerPrefs.GetInt("GemBattleGuide");
@@ -78,7 +81,7 @@
{
Debug.Log("开始新手引导");
Pause();
- uiStartMssk.gameObject.SetActive(false);
+ HideUIMask();
countDownTextNew.text = "";
countDownTextNew.gameObject.SetActive(false);
@@ -111,7 +114,16 @@
if (AudioSourceManager.Ins == null)
gameObject.AddComponent<AudioSourceManager>();
+ }
+ public void ShowUIMask()
+ {
+ uiStartMssk.gameObject.SetActive(true);
+ }
+
+ public void HideUIMask()
+ {
+ uiStartMssk.gameObject.SetActive(false);
}
/// <summary>
@@ -361,7 +373,7 @@
// 开启游戏，且隐藏中间的数字.
if (secToDo <= 0)
{
- uiStartMssk.gameObject.SetActive(false);
+ HideUIMask();
countDownTextNew.text = "";
countDownTextNew.gameObject.SetActive(false);
bGameStart = true;
--
Gitblit v1.9.1