From 914b0ab6ff4b86a809fb0b6b206504e90612a92a Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 25 Dec 2020 10:52:17 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/EndGameScreen.cs | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndGameScreen.cs b/Assets/Scripts/TowerDefense/UI/EndGameScreen.cs
index ca551a6..76728c0 100644
--- a/Assets/Scripts/TowerDefense/UI/EndGameScreen.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndGameScreen.cs
@@ -130,8 +130,6 @@
TowerPlacementGrid.GRID_OPENCASH_SELF = 100;
// 关键数据需要重置:
- // 1: 局内升级相关的数据
- SceneTowerLvl.clearInSceneTowerData();
// 2: GameUI需要清空.
GameUI.instance.restartLevel();
// 3: AgentInsManager需要重来.
@@ -246,10 +244,10 @@
protected void Victory()
{
OpenEndGameScreen(true);
- if ((victorySound != null) && (audioSource != null))
- {
- audioSource.PlayOneShot(victorySound);
- }
+ // if ((victorySound != null) && (audioSource != null))
+ // {
+ // audioSource.PlayOneShot(victorySound);
+ // }
//background.color = winBackgroundColor;
//first check if there are any more levels after this one
@@ -294,10 +292,10 @@
// nextLevelButton.enabled = false;
// nextLevelButton.gameObject.SetActive(false);
//}
- if ((defeatSound != null) && (audioSource != null))
- {
- audioSource.PlayOneShot(defeatSound);
- }
+ // if ((defeatSound != null) && (audioSource != null))
+ // {
+ // audioSource.PlayOneShot(defeatSound);
+ // }
//background.color = loseBackgroundColor;
}
--
Gitblit v1.9.1