From 9ed56dda66d5e8f6968730a46f908dfe1357c15e Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Mon, 16 Nov 2020 15:26:23 +0800
Subject: [PATCH] 修改法阵特效 修改loading适配
---
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs | 96 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 8 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
index 43d7d9b..c07baf8 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
@@ -5,6 +5,7 @@
using UnityEngine;
using TowerDefense.UI.HUD;
using Core.Utilities;
+using Core.Health;
namespace TowerDefense.Level
{
@@ -101,9 +102,29 @@
private Timer faZhenRefreshTimer;
+
+ /// <summary>
+ /// 管理法阵的对象池
+ /// </summary>
+ /// <returns></returns>
+ private Dictionary<string, List<GameObject>> faZhenDic = new Dictionary<string, List<GameObject>>();
private void Start()
{
+ faZhenDic = new Dictionary<string, List<GameObject>>();
HideTunel();
+ EventCenter.Ins.Add<float>((int)KTGMGemClient.EventType.EndlessAgentTaskDamage, OnHit);
+ EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.WaveLineFinish, WaveLineFinish);
+
+ }
+
+ /// <summary>
+ /// Agent掉血，不管是中毒还是乱七八糟的掉血，只要掉血就会接收到
+ /// </summary>
+ /// <param name="value"></param>
+ private void OnHit(float value)
+ {
+ float nowHP = EndlessBossHPManager.instance.CurrentHP - value;
+ EndlessBossHPManager.instance.SetCurrentHP(nowHP);
}
/// <summary>
@@ -144,9 +165,18 @@
/// <param name="level"></param>
public void InitPort(int level)
{
+ EndlessBuffData.InitEndlessBuffPool(level);
InitPortData(level);
InitWaveData();
RefreshBoss();
+
+ if (!GameConfig.IsNewbie)
+ {
+ endless_boss bossData = EndlessBossData.GetDataById(waveData[0].Config.resource);
+
+ if (bossData != null)
+ EndlessBossSkillManager.instance.Init(bossData.skill);
+ }
}
/// <summary>
@@ -159,7 +189,7 @@
LevelData = EndlessPortData.GetLevelWaveData(level);
TotalWaves = LevelData.Count;
CurrentWaveIndex = 0;
- EndlessBossHPManager.instance.InitHP();
+ EndlessBossHPManager.instance.Init();
EndlessLevelManager.instance.DecrementEnemies -= DecrementEnemies;
EndlessLevelManager.instance.DecrementEnemies += DecrementEnemies;
@@ -182,7 +212,6 @@
private void OnEndlessBossSummonEnd()
{
EventCenter.Ins.Remove((int)KTGMGemClient.EventType.EndlessBossSummonEnd, OnEndlessBossSummonEnd);
- EndlessBossCtrl.instance.ChangeState(EndlessBossActionState.Standing);
HideTunel();
RefreshFaZhen();
}
@@ -200,8 +229,38 @@
int tunel = waveData[i].Config.tunel;
int tunelBgId = waveData[i].Config.tunel_bg;
+ // string key = $"{faZhenPath}{tunelBgId}{tunelBgId}";
+ // List<GameObject> allPS;
+ // GameObject tmpPSObj = null;
+ // if (faZhenDic.ContainsKey(key))
+ // {
+ // allPS = faZhenDic[key];
+ // foreach (GameObject item in allPS)
+ // {
+ // if (item.activeSelf)
+ // {
+ // tmpPSObj = item;
+ // break;
+ // }
+ // }
+ // }
+
+ // if (tmpPSObj == null)
+ // {
+ // allPS = new List<GameObject>();
+ // GameObject obj = Resources.Load<GameObject>($"{faZhenPath}{tunelBgId}{tunelBgId}");
+ // GameObject faZhen = Instantiate(obj);
+ // tmpPSObj = faZhen;
+ // allPS.Add(faZhen);
+ // faZhenDic.Add(key, allPS);
+ // }
+
+ // tmpPSObj.transform.SetParent(TunelList[tunel - 1].gameObject.transform);
+ // tmpPSObj.transform.localPosition = new Vector3(0, 1, 0);
+ // tmpPSObj.transform.localScale = new Vector3(2, 2, 2);
+ // TunelList[tunel - 1].gameObject.SetActive(true);
TunelList[tunel - 1].material = Resources.Load<Material>($"{tunelMaterialPath}{tunelBgId}");
- GameObject obj = Resources.Load<GameObject>($"{faZhenPath}{tunelBgId}");
+ GameObject obj = Resources.Load<GameObject>($"{faZhenPath}{tunelBgId}{tunelBgId}");
GameObject faZhen = Instantiate(obj);
faZhen.transform.SetParent(TunelList[tunel - 1].gameObject.transform);
@@ -220,14 +279,29 @@
}
/// <summary>
+ /// 延迟关闭法阵
+ /// </summary>
+ /// <param name="WaveLineId"></param>
+ private void WaveLineFinish(int WaveLineId)
+ {
+ //StartCoroutine(CloseFaZhen(WaveLineId));
+ }
+
+ IEnumerator CloseFaZhen(int WaveLineId)
+ {
+ yield return new WaitForSeconds(1.0f);
+ Debug.Log("当前列出怪完成,WaveLineId:" + WaveLineId);
+
+ TunelList[WaveLineId - 1].gameObject.SetActive(false);
+ }
+
+ /// <summary>
/// 敌人数量减少
/// </summary>
/// <param name="count"></param>
public void DecrementEnemies(int count)
{
RemainEnemies -= count;
- // 改变血条的进度
- EndlessBossHPManager.instance.SetCurrentProgress(RemainEnemies * 1f / TotalEnemies);
}
/// <summary>
@@ -244,10 +318,11 @@
{
if (CurrentWaveIndex > 0 || TotalWaves == 1)
EndlessBossHPManager.instance.SwitchHP(CurrentWaveIndex == TotalWaves - 1);
- EndlessBossHPManager.instance.SetBossInfo($"{waveData[0].Config.boss_name} Lv.{Level}");
+ EndlessBossHPManager.instance.InitHP(EndlessPortData.GetWaveEnemiesTotalHP(Level, CurrentWaveIndex));
+ EndlessBossHPManager.instance.SetBossInfo($"第{Level}关 {waveData[0].Config.boss_name}");
EndlessBossHPManager.instance.UpdateWave(TotalWaves - CurrentWaveIndex);
- EndlessBossHPManager.instance.SetBossImage(waveData[0].Config.resource);
EndlessBossHPManager.instance.ShowHP();
+ EndlessScoreManager.instance.ShowScore();
}
/// <summary>
@@ -291,7 +366,11 @@
}
if (TotalWaveLines != 0)
+ {
isWaveStarted = true;
+ EndlessBossSkillManager.instance.Restart();
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessBeginWave);
+ }
}
/// <summary>
@@ -348,7 +427,7 @@
faZhenRefreshTimer = null;
}
- if (!isWaveStarted) return;
+ if (!isWaveStarted || EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
// 所有赛道都完成
if (CompletedWaveLine >= TotalWaveLines)
@@ -366,6 +445,7 @@
// 更新波索引
++CurrentWaveIndex;
EndlessBuffManager.instance.UpdateBuffList();
+ EndlessBossSkillManager.instance.Reset();
EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessCompletedPort, Level, CurrentWaveIndex);
if (CurrentWaveIndex >= TotalWaves)
--
Gitblit v1.9.1