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 | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs b/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs
index d44d7e5..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>
@@ -220,7 +227,8 @@
this.isInDragState = false;
- Time.timeScale = currentTimeScale;
+ if (!GameConfig.IsNewbie)
+ Time.timeScale = currentTimeScale;
}
}
@@ -247,7 +255,15 @@
// m_GameUI.TryMoveGhost(pointer, false);
// this.isInDragState = true;
+ if (GameConfig.IsNewbie)
+ {
+ if (!GameConfig.CanDragTower)
+ {
+ Debug.Log("新手不可以拖拽");
+ return;
+ }
+ }
//按照鼠标键盘的修改
// select towers
m_GameUI.TrySelectTower(pointer);
@@ -265,8 +281,16 @@
AudioSourceManager.Ins.Play(AudioEnum.DragTower);
m_GameUI.CheckAllCanPlace();//检查上阵宝石有么有可以合成的位置
- currentTimeScale = Time.timeScale;
- Time.timeScale = 0.5f;
+ if (!GameConfig.IsNewbie)
+ {
+ //新手引导这里会把引导的速度变慢
+ currentTimeScale = Time.timeScale;
+ Time.timeScale = 0.5f;
+ }
+ else
+ {
+ GuideCtrl.Ins.BeginDrag5_1();
+ }
}
}
--
Gitblit v1.9.1