From fdfb88a9ee3652e716e603f759d3be5dcc0bd3bd Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 19 Nov 2020 17:26:52 +0800
Subject: [PATCH] Merge commit '998ebc0dc00c103b365e36797c1a1ac4a6a2afa5' into master
---
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
index e137274..c07baf8 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
@@ -170,13 +170,13 @@
InitWaveData();
RefreshBoss();
- // if (!GameConfig.IsNewbie)
- // {
- // endless_boss bossData = EndlessBossData.GetDataById(waveData[0].Config.resource);
+ if (!GameConfig.IsNewbie)
+ {
+ endless_boss bossData = EndlessBossData.GetDataById(waveData[0].Config.resource);
- // if (bossData != null)
- // EndlessBossSkillManager.instance.Init(bossData.skill);
- // }
+ if (bossData != null)
+ EndlessBossSkillManager.instance.Init(bossData.skill);
+ }
}
/// <summary>
--
Gitblit v1.9.1