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

chenxin

2020-11-25 554eda43e00d5817cd3e06a60e39d4bd882ee584

 Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseTouchInput.cs

@@ -220,6 +220,7 @@

                this.isInDragState = false;

                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,10 +277,14 @@
                AudioSourceManager.Ins.Play(AudioEnum.DragTower);
                m_GameUI.CheckAllCanPlace();//检查上阵宝石有么有可以合成的位置

                if (!GameConfig.IsNewbie)
                {
                    //新手引导这里会把引导的速度变慢
                currentTimeScale = Time.timeScale;
                Time.timeScale = 0.5f;
            }
        }
        }

        /// <summary>
        /// Called when we drag