Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

chenxin

2020-12-02 54181477c210344b037d88f17dbe2cddc5cbc930

 Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs

@@ -255,10 +255,7 @@
                    Debug.Log("新手不可以拖拽");
                    return;
                }
                else
                {
                    GuideCtrl.Ins.BeginDrag11_1();
                }

            }
            //按照鼠标键盘的修改
            // select towers
@@ -283,6 +280,10 @@
                    currentTimeScale = Time.timeScale;
                    Time.timeScale = 0.5f;
                }
                else
                {
                    GuideCtrl.Ins.BeginDrag5_1();
                }
            }
        }