From 899beb99be4dcff08cade5656b9bf6354b3eaef7 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Sat, 12 Dec 2020 14:26:54 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
index d391539..6f93744 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
@@ -92,7 +92,9 @@
private void ShowGameOverPanel()
{
- EndlessRandomTower.instance.SetCountDown(false,true);
+ EndlessRandomTower.instance.SetCountDown(false);
+ EndlessRandomTower.instance.SetPS(false);
+
GameObject go = Instantiate(Resources.Load<GameObject>("Prefabs/GameOverPanel"), GameObject.Find("UICamera/BottomCanvas").transform);
EventCenter.Ins.Add((int)KTGMGemClient.EventType.GameOverEnd, GameOverEnd);
}
--
Gitblit v1.9.1