From fac697773b8cb65b3ab54569413e15fca03ad1d7 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 11 Dec 2020 20:21:14 +0800
Subject: [PATCH] Merge commit '31f0c1761b37dfd47408a93df9ed18468b50ef40' into master
---
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
index 41cc01c..ab2279b 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
@@ -62,7 +62,7 @@
EndlessUIStart.bFirstLoaded = false;
EndlessUIStart.bGameStart = false;
- TowerPlacementGridEndless.GRID_OPENCASH = 100;
+ TowerPlacementGridEndless.GRID_OPENCASH = 200;
SafelyUnsubscribe();
SceneManager.LoadScene(menuSceneName);
@@ -78,10 +78,19 @@
if (EndlessGameUI.instance.state == EndlessGameUI.State.Building)
EndlessGameUI.instance.CancelGhostPlacement();
- RefreshFinalWave();
- RefreshPropList();
- SettlementUI.SetActive(true);
- PlayEffect();
+ 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);
+ //panelUI.SetPlayEffectAC(PlayEffect);
+ //GameObject.Find("UICamera/BottomCanvas").GetComponent<Canvas>().enabled = false;
+
+ EndlessUIStart.instance.GameOver();
+ return;
+
+ // RefreshFinalWave();
+ // RefreshPropList();
+ // SettlementUI.SetActive(true);
+ // PlayEffect();
}
private void PlayEffect()
@@ -91,8 +100,8 @@
effectObj = Instantiate(EffectPrefabObject);
GameObject particleSystemObject = GameObject.Find("ParticleSystemObject");
effectObj.transform.SetParent(particleSystemObject.transform, false);
- effectObj.transform.localPosition = new Vector3(0, 0, 36.6f);
- effectObj.transform.localScale = new Vector3(3, 3, 3);
+ effectObj.transform.localPosition = new Vector3(0, -51.6f, 36.6f);
+ effectObj.transform.localScale = new Vector3(6, 6, 6);
}
ParticleSystem ps = effectObj.transform.GetChild(0).GetComponent<ParticleSystem>();
@@ -104,22 +113,25 @@
/// </summary>
protected void Victory()
{
+ ++GameConfig.GameCompletedCount;
EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessLevelCompleted);
EndlessUIStart.instance.Pause();
- int showFavorite = PlayerPrefs.GetInt("GemBattleFavorite");
+ ShowPanel();
- if (showFavorite == 0)
- {
- GameObject go = Instantiate(Resources.Load<GameObject>("UI/Favorite/FavoritePanel"), this.transform.root);
- FavoritePanelUI panelUI = go.GetComponent<FavoritePanelUI>();
- panelUI.SetAC(ShowPanel);
+ // int showFavorite = PlayerPrefs.GetInt("GemBattleFavorite");
- }
- else
- {
- ShowPanel();
- }
+ // if (showFavorite == 0)
+ // {
+ // GameObject go = Instantiate(Resources.Load<GameObject>("UI/Favorite/FavoritePanel"), this.transform.parent.parent);
+ // FavoritePanelUI panelUI = go.GetComponent<FavoritePanelUI>();
+ // panelUI.SetAC(ShowPanel);
+
+ // }
+ // else
+ // {
+ // ShowPanel();
+ // }
}
private void ShowPanel()
@@ -145,7 +157,8 @@
protected void SafelyUnsubscribe()
{
LazyLoad();
- levelManager.LevelCompleted -= Victory;
+ if (levelManager != null)
+ levelManager.LevelCompleted -= Victory;
}
/// <summary>
--
Gitblit v1.9.1