From e1a9ed955b247e4cc4615e8700b0ea34d7683224 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Tue, 15 Dec 2020 17:19:48 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
index ca9e17c..842dfb7 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
@@ -109,16 +109,23 @@
{
GameObject go = Instantiate(Resources.Load<GameObject>("UI/Final/FinalPanel"), GameObject.Find("UICamera/BottomCanvas").transform);
FinalPanel panelUI = go.GetComponent<FinalPanel>();
+ int level = EndlessLevelManager.instance.CurrentLevel;
+ int wave = EndlessLevelManager.instance.WaveManager.CurrentWaveIndex;
+
if (GameConfig.IsNewbieStart)
{
+ //panelUI.SetData($"{EndlessLevelManager.instance.CurrentLevel - EndlessPortData.NewbieTotalLevel}关 {EndlessLevelManager.instance.WaveManager.CurrentWaveIndex}波", EndlessScoreData.CurrentSocre);
+ level = EndlessLevelManager.instance.CurrentLevel - EndlessPortData.NewbieTotalLevel;
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);
+ //panelUI.SetData($"{EndlessLevelManager.instance.CurrentLevel}关 {EndlessLevelManager.instance.WaveManager.CurrentWaveIndex}波", EndlessScoreData.CurrentSocre);
}
+ panelUI.SetData($"{level}关 {wave}波", EndlessScoreData.CurrentSocre);
+
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessCompletedPort, level, wave);
+
}
private void PlayEffect()
--
Gitblit v1.9.1