From 0796302f9c288e9b99ae84879907a232854aa634 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 27 Nov 2020 14:33:52 +0800
Subject: [PATCH] 改buff 错误关卡等级bug
---
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs | 92 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 82 insertions(+), 10 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
index 2c7be27..cb0cdee 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>
@@ -142,6 +179,8 @@
/// </summary>
public List<Node> StartingNodeList;
+ public List<Node> EndNodeList;
+
/// <summary>
/// 已经完成的关卡数量
/// </summary>
@@ -164,13 +203,14 @@
/// 新手第一关是否完成
/// </summary>
private bool isFirstLevelCompleted = false;
+ private bool isSecondLevelCompleted = false;
private bool isStopSecondWaveCompleted = false;
/// <summary>
/// 赛道长度
/// </summary>
- private float tunelLength = 31.94f;
+ private float tunelLength;
private List<Vector3> homeBasePositionList;
@@ -298,6 +338,7 @@
/// </summary>
public virtual void StartLevel()
{
+ EndlessPortData.Init();
ChangeLevelState(LevelState.SpawningEnemies);
SelfPlacementArea.startCoinGenMode();
}
@@ -337,6 +378,7 @@
EndlessGameUI.instance.GameOverEvent += SafelyCallLevelCompleted;
homeBasePositionList = new List<Vector3>();
+ tunelLength = Mathf.Abs(StartingNodeList[0].transform.position.z - EndNodeList[0].transform.position.z);
for (int i = 0; i < StartingNodeList.Count; ++i)
{
@@ -380,13 +422,19 @@
if (!UpdateLevel())
ChangeLevelState(LevelState.AllEnemiesSpawned);
}
- else if (!isFirstLevelCompleted)
- {
- isFirstLevelCompleted = true;
- EndlessUIStart.instance.Pause();
- // 第一关的怪全部被杀光
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.KillDone);
- }
+ // else if (!isFirstLevelCompleted)
+ // {
+ // isFirstLevelCompleted = true;
+ // EndlessUIStart.instance.Pause();
+ // // 第一关的怪全部被杀光
+ // EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.KillDone);
+ // }
+ // else if (!isSecondLevelCompleted)
+ // {
+ // Debug.Log("开始第三关???");
+ // isSecondLevelCompleted = true;
+ // //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.CreateThirdWave);
+ // }
}
}
@@ -413,6 +461,24 @@
EndlessScoreManager.instance.AddScore(score);
EndlessBossSkillManager.instance.ClearSkillList();
EndlessBossCtrl.instance.ChangeState(EndlessBossActionState.Death);
+
+ if (GameConfig.IsNewbie)
+ {
+ if (!isFirstLevelCompleted)
+ {
+ isFirstLevelCompleted = true;
+ EndlessUIStart.instance.Pause();
+ // 第一关的怪全部被杀光
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.KillDone);
+ }
+ else if (!isSecondLevelCompleted)
+ {
+ //Debug.Log("开始第三关???");
+ isSecondLevelCompleted = true;
+ EndlessUIStart.instance.Pause();
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.ShowWarningTips);
+ }
+ }
}
/// <summary>
@@ -465,7 +531,11 @@
WaveManager.InitPort(CurrentLevel);
if (!GameConfig.IsNewbie)
+ {
+ // buff池的初始化要从正式关卡算起，不算新手关
+ EndlessBuffData.InitEndlessBuffPool(GameConfig.IsNewbieStart ? CurrentLevel - EndlessPortData.NewbieTotalLevel : CurrentLevel);
ShowSelectBuffUI();
+ }
else
{
EndlessUIStart.instance.Restart();
@@ -624,13 +694,15 @@
/// </summary>
public void StopSecondWave()
{
- Debug.LogError("--------------------- 停止第二关出怪 ---------------------");
if (!isStopSecondWaveCompleted)
{
isStopSecondWaveCompleted = true;
PauseWave();
}
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.SkillStep);
+ //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.SkillStep);
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.DragStep);
}
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1