From 554eda43e00d5817cd3e06a60e39d4bd882ee584 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 25 Nov 2020 10:33:33 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs b/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs
index d44d7e5..6b6e9e4 100644
--- a/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs
+++ b/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs
@@ -220,7 +220,8 @@
this.isInDragState = false;
- Time.timeScale = currentTimeScale;
+ if (!GameConfig.IsNewbie)
+ Time.timeScale = currentTimeScale;
}
}
@@ -247,7 +248,18 @@
// m_GameUI.TryMoveGhost(pointer, false);
// this.isInDragState = true;
-
+ if (GameConfig.IsNewbie)
+ {
+ if (!GameConfig.CanDragTower)
+ {
+ Debug.Log("新手不可以拖拽");
+ return;
+ }
+ else
+ {
+ GuideCtrl.Ins.BeginDrag11_1();
+ }
+ }
//按照鼠标键盘的修改
// select towers
m_GameUI.TrySelectTower(pointer);
@@ -265,8 +277,12 @@
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;
+ }
}
}
--
Gitblit v1.9.1