From 925d4b4b286a5d8dff4b62be0ceb25db0c45fedc Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Wed, 25 Nov 2020 20:44:48 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs b/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs
index 6532c74..5181e38 100644
--- a/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs
+++ b/Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs
@@ -157,10 +157,7 @@
Debug.Log("新手不可以拖拽");
return;
}
- else
- {
- GuideCtrl.Ins.BeginDrag11_1();
- }
+
}
// select towers
m_GameUI.TrySelectTower(pointer);
@@ -181,6 +178,10 @@
currentTimeScale = Time.timeScale;
Time.timeScale = 0.5f;
}
+ else
+ {
+ GuideCtrl.Ins.BeginDrag11_1();
+ }
}
}
--
Gitblit v1.9.1