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/UI/HUD/TowerPlacementGhost.cs | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/TowerPlacementGhost.cs b/Assets/Scripts/TowerDefense/UI/HUD/TowerPlacementGhost.cs
index b3e4f4c..a106694 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/TowerPlacementGhost.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/TowerPlacementGhost.cs
@@ -82,7 +82,7 @@
/// <param name="tower">The tower controller we're a ghost of</param>
public virtual void Initialize(Tower tower)
{
- m_MeshRenderers = GetComponentsInChildren<MeshRenderer>();
+ //m_MeshRenderers = GetComponentsInChildren<MeshRenderer>();
controller = tower;
if (GameUI.instanceExists)
{
@@ -98,18 +98,27 @@
tmat.color = new Color(1.0f, 1.0f, 1.0f, 0.0f);
}
- // 查找子结点,技能塔拖动的时候半透明:
- if (controller.towerFeature != EFeatureTower.NULL)
- {
- foreach (Transform t in transform.GetComponentsInChildren<Transform>())
- {
- if (t.name == "Cube")
- {
- t.GetComponent<MeshRenderer>().material.color = new Color(1.0f, 1.0f, 1.0f, 1.0f);
- t.GetComponent<MeshRenderer>().material.DOColor(new Color(1.0f, 1.0f, 1.0f, 0.4f), 0.4f);
- }
- }
- }
+ //特效直接把塔做了进去
+ // // 查找子结点,技能塔拖动的时候半透明:
+ // if (controller.towerFeature != EFeatureTower.NULL)
+ // {
+ // foreach (Transform t in transform.GetComponentsInChildren<Transform>())
+ // {
+ // if (t.name == "Effect")
+ // {
+ // // t.GetComponent<MeshRenderer>().material.color = new Color(1.0f, 1.0f, 1.0f, 1.0f);
+ // // t.GetComponent<MeshRenderer>().material.DOColor(new Color(1.0f, 1.0f, 1.0f, 0.4f), 0.4f);
+ // // 改为拖动的时候播放特效
+ // ParticleSystem ps = t.gameObject.GetComponent<ParticleSystem>();
+
+ // if (ps == null)
+ // ps = t.GetChild(0).GetComponent<ParticleSystem>();
+
+ // ps.Play();
+ // break;
+ // }
+ // }
+ // }
}
public void SetAttackArea(int lvl, int attid)
@@ -169,6 +178,7 @@
}
}
+ Vector3 up = new Vector3(0, 10, 0);
/// <summary>
/// Moves this ghost to a given world position
/// </summary>
@@ -178,8 +188,7 @@
/// over invalid locations</param>
public virtual void Move(Vector3 worldPosition, Quaternion rotation, bool validLocation)
{
- m_TargetPosition = worldPosition;
-
+ m_TargetPosition = worldPosition + up;
if (!m_ValidPos)
{
// Immediately move to the given position
@@ -210,9 +219,11 @@
if (Vector3.SqrMagnitude(currentPos - m_TargetPosition) > 0.01f)
{
- currentPos = Vector3.SmoothDamp(currentPos, m_TargetPosition, ref m_MoveVel, dampSpeed);
+ //currentPos = Vector3.SmoothDamp(currentPos, m_TargetPosition, ref m_MoveVel, dampSpeed);
- transform.position = currentPos;
+ //transform.position = currentPos;
+ transform.position = m_TargetPosition;
+
}
else
{
--
Gitblit v1.9.1