From 10b5f44b36f3dd0d3bdc2fcc06aa13caaa611760 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Wed, 11 Nov 2020 16:56:04 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs b/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs
index 3ab491a..af86bd2 100644
--- a/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs
+++ b/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs
@@ -149,6 +149,7 @@
float currentTimeScale = 1.0f;
protected virtual void OnStartDrag(PointerActionInfo pointer)
{
+ EndlessUIStart.instance.SetDarkGround(true);
// select towers
m_GameUI.TrySelectTower(pointer);
// River: 为了开始拖动后可以直接显示GhostTower
@@ -173,20 +174,25 @@
}
}
+ /// <summary>
+ /// 鼠标抬起
+ /// </summary>
+ /// <param name="pointer"></param>
protected void OnEndDrag(PointerActionInfo pointer)
{
// EndDrag 只能放置相关的GhostTower.
if (this.isInDragState)
{
+ EndlessUIStart.instance.SetDarkGround(false);
+
AudioSourceManager.Ins.Play(AudioEnum.PutTower);
+ m_GameUI.CloseCanPlaceRenderer();//关闭所有宝石示意
+ m_GameUI.onEndTowerDrag(pointer);
+
+ this.isInDragState = false;
+
+ Time.timeScale = currentTimeScale;
}
- m_GameUI.CloseCanPlaceRenderer();//关闭所有宝石示意
- m_GameUI.onEndTowerDrag(pointer);
-
- this.isInDragState = false;
-
- Time.timeScale = currentTimeScale;
-
}
/// <summary>
--
Gitblit v1.9.1