From 6d3bfdaad36f4af65494854e5651f7d37ad81d6b Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Sat, 12 Dec 2020 18:56:34 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
index 0417beb..ca9e17c 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
@@ -92,6 +92,9 @@
private void ShowGameOverPanel()
{
+ 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);
}
@@ -106,7 +109,16 @@
{
GameObject go = Instantiate(Resources.Load<GameObject>("UI/Final/FinalPanel"), GameObject.Find("UICamera/BottomCanvas").transform);
FinalPanel panelUI = go.GetComponent<FinalPanel>();
- panelUI.SetData($"{EndlessLevelManager.instance.CurrentLevel}关 {EndlessLevelManager.instance.WaveManager.CurrentWaveIndex}波", EndlessScoreData.CurrentSocre);
+ if (GameConfig.IsNewbieStart)
+ {
+ Debug.Log($"新手开始玩的，实际关卡：{EndlessLevelManager.instance.CurrentLevel} 新手关卡：{EndlessPortData.NewbieTotalLevel}");
+ panelUI.SetData($"{EndlessLevelManager.instance.CurrentLevel - EndlessPortData.NewbieTotalLevel}关 {EndlessLevelManager.instance.WaveManager.CurrentWaveIndex}波", EndlessScoreData.CurrentSocre);
+
+ }
+ else
+ {
+ panelUI.SetData($"{EndlessLevelManager.instance.CurrentLevel}关 {EndlessLevelManager.instance.WaveManager.CurrentWaveIndex}波", EndlessScoreData.CurrentSocre);
+ }
}
private void PlayEffect()
--
Gitblit v1.9.1