From 54181477c210344b037d88f17dbe2cddc5cbc930 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 02 Dec 2020 17:54:32 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs |   54 +++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index d8682fc..0a08e18 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -48,7 +48,7 @@
     private bool isPause;
 
     public bool beginDragStep = false;
-    public bool guideThirdWaveStep = false;
+    public bool guideFourthWaveStep = false;
 
     public GameObject darkGroundImg;
 
@@ -165,6 +165,9 @@
     {
         int guide = PlayerPrefs.GetInt("GemBattleGuide");
         GameConfig.IsNewbie = guide == 0;
+
+        GameConfig.IsNewbie = true;
+
         GameConfig.IsNewbieStart = GameConfig.IsNewbie;
 
         if (GameConfig.IsNewbie)
@@ -175,7 +178,7 @@
             HideUIMask();
             countDownTextNew.text = "";
             countDownTextNew.gameObject.SetActive(false);
-
+            //GameObject go = Resources.Load<GameObject>("UI/Guide/GuidePanel");
             GameObject guideObj = Instantiate(Resources.Load<GameObject>("UI/Guide/GuidePanel"), transform.Find("Panel"));
             guideObj.GetComponent<RectTransform>().offsetMin += tmpOffect;
             AddGuideEvent();
@@ -250,14 +253,18 @@
     /// </summary>
     private void AddGuideEvent()
     {
-        EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFireLv2, CreateFireLv2);
+        EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateWoodLv2, CreateWoodLv2);
         EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFirstWave, CreateFirstWave);
         EventCenter.Ins.Add((int)KTGMGemClient.EventType.RestartWave, RestartWave);
         EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.AddGold, AddGold);
+        EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFireLv1, CreateFireLv1);
         EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateWaterLv1, CreateWaterLv1);
+
         EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateSecondWave, CreateSecondWave);
         EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateThirdWave, CreateThirdWave);
-        EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateThirdWaveDone, CreateThirdWaveDone);
+
+        EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFourthWave, CreateFourthWave);
+        EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateFourthWaveDone, CreateFourthWaveDone);
         EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.GuideEnergyUp, GuideEnergyUp);
 
 
@@ -271,9 +278,13 @@
     /// <summary>
     /// 在（2，3）位置放置一个火元素的塔
     /// </summary>
-    private void CreateFireLv2()
+    private void CreateWoodLv2()
     {
-        Tower aTower = EndlessRandomTower.instance.getTowerByName("GrowUpTower");
+        //GrowUpTower 火
+        //BlinkTower 木
+        //CopyCatTower 水
+
+        Tower aTower = EndlessRandomTower.instance.getTowerByName("BlinkTower");
         EndlessGameUI.instance.PlaceTowerForce(aTower, new IntVector2(2, 3), 2);
     }
 
@@ -283,7 +294,7 @@
     private void CreateFirstWave()
     {
         Restart();
-        EventCenter.Ins.Add((int)KTGMGemClient.EventType.FireTowerChargeEnd, OnFireTowerChargeEnd);
+        //EventCenter.Ins.Add((int)KTGMGemClient.EventType.FireTowerChargeEnd, OnFireTowerChargeEnd);
     }
 
     /// <summary>
@@ -293,8 +304,8 @@
     {
         Pause();
         EndlessLevelManager.instance.PauseWave();
-        EventCenter.Ins.Remove((int)KTGMGemClient.EventType.FireTowerChargeEnd, OnFireTowerChargeEnd);
-        EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.ChargingEnd);
+        //EventCenter.Ins.Remove((int)KTGMGemClient.EventType.FireTowerChargeEnd, OnFireTowerChargeEnd);
+        //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.ChargingEnd);
     }
 
     /// <summary>
@@ -334,10 +345,19 @@
     /// <summary>
     /// 在攻击位置上创建一个1级的木塔
     /// </summary>
+    private void CreateFireLv1()
+    {
+        Tower aTower = EndlessRandomTower.instance.getTowerByName("GrowUpTower");
+        EndlessGameUI.instance.PlaceTowerForce(aTower, new IntVector2(1, 3), 1);
+    }
+
+    /// <summary>
+    /// 在攻击位置上创建一个1级的木塔
+    /// </summary>
     private void CreateWaterLv1()
     {
-        Tower aTower = EndlessRandomTower.instance.getTowerByName("BlinkTower");
-        EndlessGameUI.instance.PlaceTowerForce(aTower, new IntVector2(1, 3), 1);
+        Tower aTower = EndlessRandomTower.instance.getTowerByName("CopyCatTower");
+        EndlessGameUI.instance.PlaceTowerForce(aTower, new IntVector2(3, 3), 1);
     }
 
     /// <summary>
@@ -358,18 +378,26 @@
 
         EndlessLevelManager.instance.NewbieUpdateLevel();
         beginDragStep = false;
-        guideThirdWaveStep = true;
     }
 
     /// <summary>
     /// 第三关出兵完毕，暂停出兵
     /// </summary>
-    private void CreateThirdWaveDone()
+    private void CreateFourthWaveDone()
     {
         EndlessLevelManager.instance.PauseWave();
     }
 
+    /// <summary>
+    /// 开始第四关
+    /// </summary>
+    private void CreateFourthWave()
+    {
+        CommonDebugHelper.Debug($"开始下一关");
 
+        EndlessLevelManager.instance.NewbieUpdateLevel();
+        guideFourthWaveStep = true;
+    }
 
 
     /// <summary>

--
Gitblit v1.9.1