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

liuzhiwei

2020-11-18 218844e4629799d61bc777b26fcbe3dd4ae0fc4b

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

 Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs

@@ -499,7 +499,7 @@
        public void OnBuffSelectCompleted(int index)
        {
            isBuffSelectCompleted = false;
            EndlessBuffManager.instance.AddBuff(EndlessBuffData.GetBuffById(22));
            EndlessBuffManager.instance.AddBuff(EndlessBuffData.GetBuffByIndex(index));
            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessBuffRefresh);
        }


 Assets/Scripts/TowerDefense/Towers/TowerFireTrigger.cs

@@ -12,29 +12,29 @@
    {
        public AttackAffector Affector;

        private bool isStart;
        // private bool isStart;

        private float duration;
        // private float duration;

        public void OnFire()
        {
            // cx test
            if (!isStart)
            {
                isStart = true;
            }
            else
            {
                Debug.Log($"--------------------- {duration} ---------------------");
                duration = 0;
            }
            // if (!isStart)
            // {
            //     isStart = true;
            // }
            // else
            // {
            //     Debug.Log($"--------------------- {duration} ---------------------");
            //     duration = 0;
            // }
            Affector.FireProjectile();
        }

        private void Update()
        {
            if (isStart)
                duration += Time.deltaTime;
        }
        // private void Update()
        // {
        //     if (isStart)
        //         duration += Time.deltaTime;
        // }
    }
}