From b66ebdf748f0f8ca0384fb80df379584ab0c9314 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 04 Dec 2020 11:49:15 +0800
Subject: [PATCH] 替换减速和暴击飘字图片

---
 Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
index 94a8b19..449cf6b 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,17 +78,19 @@
             if (EndlessGameUI.instance.state == EndlessGameUI.State.Building)
                 EndlessGameUI.instance.CancelGhostPlacement();
 
-            GameObject go = Instantiate(Resources.Load<GameObject>("UI/Final/FinalPanel"), GameObject.Find("MainUI").transform);
+            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.SetData($"{EndlessLevelManager.instance.CurrentLevel}关 {EndlessLevelManager.instance.WaveManager.CurrentWaveIndex}波", EndlessScoreData.CurrentSocre);
             panelUI.SetPlayEffectAC(PlayEffect);
-            GameObject.Find("BottomUI").GetComponent<Canvas>().enabled = false;
+            //GameObject.Find("UICamera/BottomCanvas").GetComponent<Canvas>().enabled = false;
+
+            EndlessUIStart.instance.GameOver();
             return;
 
-            RefreshFinalWave();
-            RefreshPropList();
-            SettlementUI.SetActive(true);
-            PlayEffect();
+            // RefreshFinalWave();
+            // RefreshPropList();
+            // SettlementUI.SetActive(true);
+            // PlayEffect();
         }
 
         private void PlayEffect()
@@ -98,7 +100,7 @@
                 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.localPosition = new Vector3(0, -51.6f, 36.6f);
                 effectObj.transform.localScale = new Vector3(6, 6, 6);
             }
 
@@ -118,7 +120,7 @@
 
             if (showFavorite == 0)
             {
-                GameObject go = Instantiate(Resources.Load<GameObject>("UI/Favorite/FavoritePanel"), this.transform.root);
+                GameObject go = Instantiate(Resources.Load<GameObject>("UI/Favorite/FavoritePanel"), this.transform.parent.parent);
                 FavoritePanelUI panelUI = go.GetComponent<FavoritePanelUI>();
                 panelUI.SetAC(ShowPanel);
 

--
Gitblit v1.9.1