From 38c000e2fd4705b197b5d587f081fd775667182a Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Fri, 04 Dec 2020 13:57:04 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Level/EndlessWave.cs | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWave.cs b/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
index de844d2..bafa040 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
@@ -172,8 +172,6 @@
int gold = waveData.Config.b_coin * enemyData.coin_rate;
newAgent.SetAgentData(hp, speed, gold);
- // todo 这里先填1级后面需要修改
- newAgent.healthBar.SetHealthLevel(1);
// 加入Manager统一管理.
AgentInsManager.instance.addAgent(newAgent);
@@ -194,17 +192,16 @@
doubleAgent.Initialize();
doubleAgent.SetAgentData(hp, speed, gold);
- doubleAgent.healthBar.SetHealthLevel(1);
AgentInsManager.instance.addAgent(doubleAgent);
}
}
/// <summary>
- /// 从Tower的AttributeId获取到怪物的数据
- /// </summary>
- /// <param name="id"></param>
- /// <returns></returns>
- protected List<int> GetMonsterDataFromAttributeId(int id)
+ /// 从Tower的AttributeId获取到怪物的数据
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ protected List<int> GetMonsterDataFromAttributeId(int id)
{
geminfo tgem = new geminfo();
if (JsonDataCenter.gemInfoDic.TryGetValue(id, out tgem))
--
Gitblit v1.9.1