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

liuzhiwei

2020-11-25 dbdac05546e47dd02381204f4f56e10f601f3c29

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

@@ -14,7 +14,7 @@
    // 当前类所在的Btn.
    public Button randomBtn;

    public Button skillBtn;
    //public Button skillBtn;

    /// <summary>
    /// 购买二级宝石的按钮贴图.
@@ -80,37 +80,37 @@
        bSetBuyLvlUp = false;
        bCdTimeStart = false;
        randomBtn.onClick.AddListener(delegate () { onClick(EFeatureTower.NULL); });
        skillBtn.onClick.AddListener(delegate () { onClick(EFeatureTower.Skill_Bomb); });
        //skillBtn.onClick.AddListener(delegate () { onClick(EFeatureTower.Skill_Bomb); });
        UpdateDescDisplay();
    }

    public void UpdateDescDisplay()
    {
        int minLevel = EndlessGameUI.instance.MinLevel;
        int minLevel = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);

        NormalDesc.text = $"购买{minLevel + 1}级宝石";
        SkillDesc.text = $"购买{minLevel + 1}级技能宝石";
        //SkillDesc.text = $"购买{minLevel + 1}级技能宝石";
    }

    public void ChangeBtnClickNormal()
    {
        randomBtn.onClick.RemoveAllListeners();
        skillBtn.onClick.RemoveAllListeners();
        //skillBtn.onClick.RemoveAllListeners();
        randomBtn.onClick.AddListener(delegate () { onClick(EFeatureTower.NULL); });
        skillBtn.onClick.AddListener(delegate () { onClick(EFeatureTower.Skill_Bomb); });
        //skillBtn.onClick.AddListener(delegate () { onClick(EFeatureTower.Skill_Bomb); });
    }
    public void ChangeBtnClick()
    {
        randomBtn.onClick.RemoveAllListeners();
        skillBtn.onClick.RemoveAllListeners();
        //skillBtn.onClick.RemoveAllListeners();
        randomBtn.onClick.AddListener(() =>
        {
            AudioSourceManager.Ins.Play(AudioEnum.UIDisable);
        });
        skillBtn.onClick.AddListener(() =>
        {
            AudioSourceManager.Ins.Play(AudioEnum.UIDisable);
        });
        // skillBtn.onClick.AddListener(() =>
        // {
        //     AudioSourceManager.Ins.Play(AudioEnum.UIDisable);
        // });
    }

    /// <summary>
@@ -119,33 +119,6 @@
    public List<Tower> towerList
    {
        get { return this.towerArray; }
    }

    /// <summary>
    /// 处理按钮升级相关.
    /// </summary>
    private void Update()
    {
        float gstime = EndlessUIStart.instance.GameStartTime;
        if (gstime <= 0) return;

        if ((!bCdTimeStart) && (LEVELUP_TOWER_TIME - gstime) <= JsonDataCenter.TOWERLVLUP_CDTIME)
        {
            bCdTimeStart = true;
            btnLvlUpCdTime = LEVELUP_TOWER_TIME - gstime;
        }
        if ((!bSetBuyLvlUp) && (gstime > LEVELUP_TOWER_TIME))
        {
            bSetBuyLvlUp = true;
            this.randomBtn.GetComponent<Image>().sprite = buyBtnLevelUp;
        }

        // 更新倒计时：
        if ((!bSetBuyLvlUp) && bCdTimeStart)
        {
            btnLvlUpCdTime -= Time.deltaTime;
            string distr = ((int)Math.Ceiling(btnLvlUpCdTime)).ToString() + "s";
        }
    }

    public void actionTest()
@@ -315,10 +288,10 @@
        if (gameUI.isBuilding)
            gameUI.CancelGhostPlacement();

        // if (level == -1)
        //     level = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);
        if (level == -1)
            level = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);

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

    /// <summary>