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/EndlessTowerDefenseTouchInput.cs | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs b/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs
index c74a737..e475034 100644
--- a/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs
+++ b/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs
@@ -192,19 +192,35 @@
}
}
}
+ float currentTimeScale = 1.0f;
/// <summary>
/// Called on input release, for flicks
/// </summary>
protected override void OnRelease(PointerActionInfo pointer)
{
+ // // EndDrag 只能放置相关的GhostTower.
+ // if (this.isInDragState)
+ // m_GameUI.onEndTowerDrag(pointer);
+ // //m_GameUI.TryPlaceTower(pointer);
+
+ // this.isInDragState = false;
+ // return;
+
+ //按照鼠标键盘的修改
// EndDrag 只能放置相关的GhostTower.
if (this.isInDragState)
- m_GameUI.onEndTowerDrag(pointer);
- //m_GameUI.TryPlaceTower(pointer);
+ {
+ EndlessUIStart.instance.SetDarkGround(false);
- this.isInDragState = false;
- return;
+ AudioSourceManager.Ins.Play(AudioEnum.PutTower);
+ m_GameUI.CloseCanPlaceRenderer();//关闭所有宝石示意
+ m_GameUI.onEndTowerDrag(pointer);
+
+ this.isInDragState = false;
+
+ Time.timeScale = currentTimeScale;
+ }
}
@@ -223,13 +239,34 @@
/// <param name="pointer"></param>
protected virtual void OnStartDrag(PointerActionInfo pointer)
{
- //Debug.Log("TouchInput StartDraged.");
+ // //Debug.Log("TouchInput StartDraged.");
+ // // select towers
+ // m_GameUI.TrySelectTower(pointer);
+ // // River: 为了开始拖动后可以直接显示GhostTower
+ // m_GameUI.TryMoveGhost(pointer, false);
+
+ // this.isInDragState = true;
+
+ //按照鼠标键盘的修改
// select towers
m_GameUI.TrySelectTower(pointer);
// River: 为了开始拖动后可以直接显示GhostTower
m_GameUI.TryMoveGhost(pointer, false);
- this.isInDragState = true;
+ Debug.LogError("OnStartDrag");
+ if (m_GameUI.HasTower)
+ {
+ Debug.LogError("m_GameUI.HasTower：" + m_GameUI.HasTower);
+
+ EndlessUIStart.instance.SetDarkGround(true);
+
+ this.isInDragState = true;
+ AudioSourceManager.Ins.Play(AudioEnum.DragTower);
+ m_GameUI.CheckAllCanPlace();//检查上阵宝石有么有可以合成的位置
+
+ currentTimeScale = Time.timeScale;
+ Time.timeScale = 0.5f;
+ }
}
/// <summary>
@@ -237,12 +274,20 @@
/// </summary>
protected override void OnDrag(PointerActionInfo pointer)
{
+ // if ((pointer != null) && (m_GameUI.isBuilding))
+ // {
+ // m_GameUI.TryMoveGhost(pointer, false);
+ // }
+
+ // return;
+
+ //按照鼠标键盘的修改
if ((pointer != null) && (m_GameUI.isBuilding))
{
m_GameUI.TryMoveGhost(pointer, false);
- }
- return;
+ m_GameUI.CheckTowerPlace(pointer);
+ }
}
/// <summary>
--
Gitblit v1.9.1