From f26be14b5365bdd2e14d8753beb3439c9a2cbdd4 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Tue, 08 Dec 2020 14:27:34 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle
---
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs b/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs
index 6b6e9e4..4590996 100644
--- a/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs
+++ b/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs
@@ -86,6 +86,7 @@
if (InputController.instanceExists)
{
InputController.instance.tapped += OnTap;
+ InputController.instance.pressed += OnPressed;
InputController.instance.startedDrag += OnStartDrag;
}
@@ -115,6 +116,7 @@
if (InputController.instanceExists)
{
InputController.instance.tapped -= OnTap;
+ InputController.instance.pressed -= OnPressed;
InputController.instance.startedDrag -= OnStartDrag;
}
if (m_GameUI != null)
@@ -122,6 +124,11 @@
m_GameUI.stateChanged -= OnStateChanged;
m_GameUI.ghostBecameValid -= OnGhostBecameValid;
}
+ }
+
+ private void OnPressed(PointerActionInfo pointer)
+ {
+ m_GameUI.OnPressed(pointer);
}
/// <summary>
@@ -255,10 +262,7 @@
Debug.Log("新手不可以拖拽");
return;
}
- else
- {
- GuideCtrl.Ins.BeginDrag11_1();
- }
+
}
//按照鼠标键盘的修改
// select towers
@@ -283,6 +287,10 @@
currentTimeScale = Time.timeScale;
Time.timeScale = 0.5f;
}
+ else
+ {
+ GuideCtrl.Ins.BeginDrag5_1();
+ }
}
}
--
Gitblit v1.9.1