From 17c6e8b6f2aee4ed9a15c886f54a73f0cb61b125 Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Wed, 09 Dec 2020 17:14:59 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Scripts/TowerDefense/Towers/Tower.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Towers/Tower.cs b/Assets/Scripts/TowerDefense/Towers/Tower.cs
index 4f5277d..bc7139a 100644
--- a/Assets/Scripts/TowerDefense/Towers/Tower.cs
+++ b/Assets/Scripts/TowerDefense/Towers/Tower.cs
@@ -88,7 +88,7 @@
/// <summary>
/// The current level of the tower
/// </summary>
- public int currentLevel { get; protected set; }
+ public int currentLevel { get; set; }
protected bool m_bInAttackMode = false;
@@ -335,7 +335,7 @@
Vector3 pos = tapObj.transform.position;
pos.x += 5.8f;
pos.z += 3f;
- pos.y = 15f;
+ pos.y = 20f;
tapObj.transform.position = pos;
ps?.Play();
}
@@ -377,6 +377,8 @@
obj.transform.position = transform.position;
obj.transform.GetChild(0).GetComponent<ParticleSystem>().Play();
Destroy(obj, 1.2f);
+ AudioSourceManager.Ins.StopBossWaterSkill();
+
}
/// <summary>
@@ -395,6 +397,8 @@
pos.y += gridPosition.y == 3 ? 2f : 1f;
bondageObj.transform.position = pos;
bondageObj.transform.GetChild(0).GetComponent<ParticleSystem>().Play();
+ AudioSourceManager.Ins.Play(AudioEnum.BossWaterSkill);
+
}
/// <summary>
@@ -864,6 +868,12 @@
CurrentTowerLevel.Initialize(this, enemyLayerMask, configuration.alignmentProvider);
CurrentTowerLevel.SetShowLevel(level + 1);
+ //if(gridPosition.y>=2)
+ {
+ //Debug.Log("上阵状态，设置缩放");
+ CurrentTowerLevel.SetScale(level + 1);
+ }
+
// disable affectors
LevelState levelState = LevelState.Intro;
if (LevelManager.instanceExists)
--
Gitblit v1.9.1