From 18f96c9313bf24d2296e615f44fc0ca005f2e872 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 12 Nov 2020 16:05:44 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs b/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs
index af86bd2..f67a02f 100644
--- a/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs
+++ b/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs
@@ -149,19 +149,23 @@
float currentTimeScale = 1.0f;
protected virtual void OnStartDrag(PointerActionInfo pointer)
{
- EndlessUIStart.instance.SetDarkGround(true);
// select towers
m_GameUI.TrySelectTower(pointer);
// River: 为了开始拖动后可以直接显示GhostTower
m_GameUI.TryMoveGhost(pointer, false);
- this.isInDragState = true;
- AudioSourceManager.Ins.Play(AudioEnum.DragTower);
- m_GameUI.CheckAllCanPlace();//检查上阵宝石有么有可以合成的位置
+ if (m_GameUI.HasTower)
+ {
+ EndlessUIStart.instance.SetDarkGround(true);
- currentTimeScale = Time.timeScale;
- Time.timeScale = 0.5f;
+ Debug.Log("什么时候拖拽的");
+ this.isInDragState = true;
+ AudioSourceManager.Ins.Play(AudioEnum.DragTower);
+ m_GameUI.CheckAllCanPlace();//检查上阵宝石有么有可以合成的位置
+ currentTimeScale = Time.timeScale;
+ Time.timeScale = 0.5f;
+ }
}
protected override void OnDrag(PointerActionInfo pointer)
--
Gitblit v1.9.1