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

chenxin

2020-11-25 554eda43e00d5817cd3e06a60e39d4bd882ee584

 Assets/Scripts/TowerDefense/Input/EndlessTowerDefenseKeyboardMouseInput.cs

@@ -5,6 +5,7 @@
using UnityEngine;
using UnityInput = UnityEngine.Input;
using State = TowerDefense.UI.HUD.EndlessGameUI.State;
using KTGMGemClient;

namespace TowerDefense.Input
{
@@ -149,6 +150,18 @@
        float currentTimeScale = 1.0f;
        protected virtual void OnStartDrag(PointerActionInfo pointer)
        {
            if (GameConfig.IsNewbie)
            {
                if (!GameConfig.CanDragTower)
                {
                    Debug.Log("新手不可以拖拽");
                    return;
                }
                else
                {
                    GuideCtrl.Ins.BeginDrag11_1();
                }
            }
            // select towers
            m_GameUI.TrySelectTower(pointer);
            // River: 为了开始拖动后可以直接显示GhostTower
@@ -162,8 +175,13 @@
                AudioSourceManager.Ins.Play(AudioEnum.DragTower);
                m_GameUI.CheckAllCanPlace();//检查上阵宝石有么有可以合成的位置

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

            }
        }

@@ -194,6 +212,7 @@

                this.isInDragState = false;

                if (!GameConfig.IsNewbie)
                Time.timeScale = currentTimeScale;
            }
        }