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

chenxin

2020-12-18 7b9712f33f42b14e4d277166fa533a379021312d

 Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs

@@ -9,6 +9,7 @@
using TMPro;
using KTGMGemClient;
using DG.Tweening;
using System.Collections;

public class EndlessRandomTower : Singleton<EndlessRandomTower>
{
@@ -57,9 +58,32 @@

    public ParticleSystem btnPS;

    IEnumerator ReadJson()
    {
        while (!GameConfig.JsonReadDone)
        {
            yield return 10;
        }

        countDownLimit = JsonDataCenter.GetById<battle>(23).value;
        Debug.Log("设置了倒计时：" + countDownLimit);
        yield break;
    }

    // Start is called before the first frame update
    void Start()
    {
#if UNITY_ANDROID

#endif
#if UNITY_IPHONE

#endif
#if UNITY_EDITOR

#endif
        StartCoroutine(ReadJson());

        if (!EndlessLevelManager.instanceExists)
            Debug.LogError("[UI] No level manager for tower list");

@@ -81,17 +105,16 @@
        bSetBuyLvlUp = false;
        bCdTimeStart = false;
        randomBtn.onClick.AddListener(delegate () { onClick(EFeatureTower.NULL); });
        UpdateDescDisplay();
        NormalDesc.text = $"购买{0 + 1}级精灵";
        Invoke("UpdateDescDisplay", 1.0f);
        //UpdateDescDisplay();
    }

    public void UpdateDescDisplay()
    {
        int minLevel = 0;
        int minLevel = GameConfig.IsUpgradeTowerLevel ? 1 : 0;

        if (EndlessUIStart.instance.GameStartTime >= JsonDataCenter.DOUBLE_GEM_TIME)
            minLevel = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);

        NormalDesc.text = $"购买{minLevel + 1}级宝石";
        NormalDesc.text = $"购买{minLevel + 1}级精灵";
    }

    public void ChangeBtnClickNormal()
@@ -229,7 +252,7 @@

        if (EndlessGameUI.instance.tdBuyDisable)
        {
            cashText.color = new Color(1f, 0f, 0f);
            cashText.color = new Color(218f / 255f, 32f / 255f, 32f / 255f);
            DOTween.To(() => cashText.color, (Color v) => cashText.color = v, cashText.color, 0.2f)
                .OnComplete(CheckCurrencyEnough);
            return;
@@ -261,7 +284,21 @@
    public void SetCountDown(bool isOn, bool isReset = false)
    {
        isCountStartDown = isOn;
        if (isReset) countDownTime = 0;
        if (isReset)
        {
            countDownTime = 0;
            if (needClickPS.isPlaying)
                needClickPS.Stop();
        }
    }

    public void SetPS(bool isOn)
    {
        if (needClickPS.gameObject.activeSelf != isOn)
        {
            needClickPS.gameObject.SetActive(isOn);
        }

    }
    float countDownTime = 0f;
    float countDownLimit = 5f;
@@ -274,7 +311,6 @@
        if (isCountStartDown)
        {
            countDownTime += Time.deltaTime;
            Debug.Log("倒计时中");
            if (countDownTime > countDownLimit)
            {

@@ -299,12 +335,24 @@

        if (current >= result && num < 10)//自己的钱多
        {
            //Debug.Log($"当前金币 :{current}  下一次购买需要金币:{result}  塔的数量:{num}");
            isCountStartDown = false;
            needClickPS.Play();
        }
    }


    public void CheckMoney()
    {
        int result;
        int.TryParse(cashText.text.ToString(), out result);
        int current = EndlessLevelManager.instance.Currency.currentCurrency;
        if (current < result && needClickPS.isPlaying)//自己的钱多
        {
            needClickPS.Stop();
            isCountStartDown = true;
            countDownTime = 0;
        }
    }

    private void CheckCurrencyEnough()
    {
@@ -331,15 +379,9 @@
        if (gameUI.isBuilding)
            gameUI.CancelGhostPlacement();

        if (EndlessUIStart.instance.GameStartTime >= JsonDataCenter.DOUBLE_GEM_TIME)
        if (level == -1)
        {
            if (level == -1)
                level = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);
        }
        else
        {
            if (level == -1)
                level = 0;
            level = GameConfig.IsUpgradeTowerLevel ? 1 : 0;
        }

        return gameUI.RandomPlaceTower(tower, posx, posy, level, cost, false, isFirstAppear);