From a1f0653ec48d7787e0d57cabef0600b2a07355eb Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Sat, 31 Oct 2020 17:03:14 +0800
Subject: [PATCH] 解决冲突
---
Assets/Scripts/TowerDefense/Input/TowerDefenseTouchInput.cs | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Input/TowerDefenseTouchInput.cs b/Assets/Scripts/TowerDefense/Input/TowerDefenseTouchInput.cs
index 92978c7..20a0afb 100644
--- a/Assets/Scripts/TowerDefense/Input/TowerDefenseTouchInput.cs
+++ b/Assets/Scripts/TowerDefense/Input/TowerDefenseTouchInput.cs
@@ -216,30 +216,30 @@
protected virtual void OnTap(PointerActionInfo pointerActionInfo)
{
return;
- var touchInfo = pointerActionInfo as TouchInfo;
- if (touchInfo != null)
- {
- if (m_GameUI.state == State.Normal && !touchInfo.startedOverUI)
- {
- m_GameUI.TrySelectTower(touchInfo);
- }
- else if (m_GameUI.state == State.Building && !touchInfo.startedOverUI)
- {
- m_GameUI.TryMoveGhost(touchInfo, false);
- if (m_GameUI.IsGhostAtValidPosition() && m_GameUI.IsValidPurchase())
- {
- confirmationButtons.canvasEnabled = true;
- invalidButtons.canvasEnabled = false;
- confirmationButtons.TryMove(touchInfo.currentPosition);
- }
- else
- {
- invalidButtons.canvasEnabled = true;
- invalidButtons.TryMove(touchInfo.currentPosition);
- confirmationButtons.canvasEnabled = false;
- }
- }
- }
+ // var touchInfo = pointerActionInfo as TouchInfo;
+ // if (touchInfo != null)
+ // {
+ // if (m_GameUI.state == State.Normal && !touchInfo.startedOverUI)
+ // {
+ // m_GameUI.TrySelectTower(touchInfo);
+ // }
+ // else if (m_GameUI.state == State.Building && !touchInfo.startedOverUI)
+ // {
+ // m_GameUI.TryMoveGhost(touchInfo, false);
+ // if (m_GameUI.IsGhostAtValidPosition() && m_GameUI.IsValidPurchase())
+ // {
+ // confirmationButtons.canvasEnabled = true;
+ // invalidButtons.canvasEnabled = false;
+ // confirmationButtons.TryMove(touchInfo.currentPosition);
+ // }
+ // else
+ // {
+ // invalidButtons.canvasEnabled = true;
+ // invalidButtons.TryMove(touchInfo.currentPosition);
+ // confirmationButtons.canvasEnabled = false;
+ // }
+ // }
+ // }
}
/// <summary>
--
Gitblit v1.9.1