From c1d12cdfd23933a0db431a70ff5e145924864782 Mon Sep 17 00:00:00 2001
From: River Jiang <546213258@qq.com>
Date: Wed, 21 Oct 2020 15:08:29 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index ab79cf8..e2dd0f7 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -19,9 +19,9 @@
public TextMeshProUGUI timeStatic = null;
/// <summary>
- /// 选择buff界面
+ /// 结算界面
/// </summary>
- public GameObject SelectBuffUI;
+ public GameObject SettlementUI;
/// <summary>
/// 倒计时整体的背景图片Mask
@@ -42,6 +42,8 @@
protected bool[] bVibrate;
+ private bool isPause;
+
// Start is called before the first frame update
void Start()
{
@@ -53,8 +55,9 @@
if (timeStatic)
timeStatic.gameObject.SetActive(false);
- SelectBuffUI.SetActive(false);
+ EndlessBuffSelect.instance.HideBuffUI();
EndlessBossHPManager.instance.HideHP();
+ SettlementUI.SetActive(false);
}
/// <summary>
@@ -98,24 +101,38 @@
}
}
+ public void Pause()
+ {
+ isPause = true;
+ }
+
+ public void Restart()
+ {
+ isPause = false;
+ }
+
+ public bool IsGameRunning { get { return !isPause; } }
+
// Update is called once per frame
void Update()
{
+ if (isPause) return;
+
if (bGameStart)
{
startTime += Time.deltaTime;
timeTextNew.text = ConvertTime((float)Math.Ceiling(startTime));
}
- if ((!bFirstLoaded) && (!bGameStart))
+ if (!bFirstLoaded && !bGameStart)
{
bFirstLoaded = true;
secToDo = 4;
}
- if (bFirstLoaded && (!bGameStart))
+ if (bFirstLoaded && !bGameStart)
{
- secToDo -= (Time.deltaTime * 1.0f); // 放慢时间用于调试
+ secToDo -= Time.deltaTime;
if (secToDo >= 3)
{
@@ -159,12 +176,10 @@
{
uiStartMssk.gameObject.SetActive(false);
countDownTextNew.text = "";
-
+ bGameStart = true;
// 开始关卡
EndlessLevelManager.instance.StartLevel();
-
timeTextNew.gameObject.SetActive(true);
- bGameStart = true;
// 开始播放背景音乐.
if (bgMusic != null)
--
Gitblit v1.9.1