From a9bf69ea82070c8e9723e610cb7cea430f2daa11 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Thu, 10 Dec 2020 20:40:04 +0800
Subject: [PATCH] 调整技能点击区域

---
 Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
index 458e227..8b7f252 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
@@ -32,6 +32,43 @@
         /// </summary>
         public int CurrentLevel { get; set; } = 1;
 
+        private float dropRate;
+
+        /// <summary>
+        /// 当前金币掉率
+        /// </summary>
+        /// <value></value>
+        public float DropRate
+        {
+            get
+            {
+                return dropRate;
+            }
+            set
+            {
+                dropRate = value;
+                Debug.Log("设置了掉率" + dropRate);
+            }
+        }
+
+        private int dropCoin;
+
+        /// <summary>
+        /// 当前金币
+        /// </summary>
+        /// <value></value>
+        public int DropCoin
+        {
+            get
+            {
+                return dropCoin;
+            }
+            set
+            {
+                dropCoin = value;
+            }
+        }
+
         protected static readonly int MAX_TOWER = 5;
 
         /// <summary>
@@ -154,8 +191,6 @@
         /// </summary>
         /// <value></value>
         public int SelectBuffNeddLevels { get; set; }
-        // cx test
-        // public int SelectBuffNeddLevels { get; set; } = 2;
 
         /// <summary>
         /// buff是否选择完成
@@ -167,6 +202,7 @@
         /// </summary>
         private bool isFirstLevelCompleted = false;
         private bool isSecondLevelCompleted = false;
+        private bool isThirdLevelCompleted = false;
 
         private bool isStopSecondWaveCompleted = false;
 
@@ -439,7 +475,13 @@
                     //Debug.Log("开始第三关???");
                     isSecondLevelCompleted = true;
                     EndlessUIStart.instance.Pause();
-                    EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.ShowWarningTips);
+                    EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.KillSecondDone);
+                }
+                else if (isFirstLevelCompleted && isSecondLevelCompleted && !isThirdLevelCompleted)
+                {
+                    isThirdLevelCompleted = true;
+                    EndlessUIStart.instance.Pause();
+                    EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.KillThirdDone);
                 }
             }
         }
@@ -467,7 +509,6 @@
         public void NewbieUpdateLevel()
         {
             ++CurrentLevel;
-            EndlessBuffData.InitEndlessBuffPool(CurrentLevel);
             WaveManager.InitPort(CurrentLevel);
             IsAllWaveCompleted = false;
             EndlessUIStart.instance.Restart();
@@ -490,15 +531,18 @@
         private void BeginLevel()
         {
             if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
-
-            EndlessBuffData.InitEndlessBuffPool(CurrentLevel);
+        
+            EndlessBossCtrl.instance.ClearBoss();
 
             if (CurrentLevel == startLevel)
-
                 WaveManager.InitPort(CurrentLevel);
 
             if (!GameConfig.IsNewbie)
+            {
+                // buff池的初始化要从正式关卡算起,不算新手关
+                EndlessBuffData.InitEndlessBuffPool(GameConfig.IsNewbieStart ? CurrentLevel - EndlessPortData.NewbieTotalLevel : CurrentLevel);
                 ShowSelectBuffUI();
+            }
             else
             {
                 EndlessUIStart.instance.Restart();
@@ -666,6 +710,6 @@
             EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.DragStep);
         }
 
-        
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1