chenxin
2020-12-11 c1ef6cbe7088df7eb236272db0621d5f51c02e5f
金币效果调整2
6 files modified
59 ■■■■ changed files
Assets/Prefabs/UI/Endless/BottomCanvas.prefab 3 ●●●● patch | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless2D.unity 15 ●●●●● patch | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 2 ●●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessTowerGridOpen.cs 15 ●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 4 ●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs 20 ●●●●● patch | view | raw | blame | history
Assets/Prefabs/UI/Endless/BottomCanvas.prefab
@@ -787,6 +787,7 @@
  m_EditorClassIdentifier: 
  randomBtn: {fileID: 4623057511312575045}
  buyBtnLevelUp: {fileID: 21300000, guid: 3ffe4129e848f0d4dae264dd341cb920, type: 3}
  cashText: {fileID: 4623057513087273501}
  NormalDesc: {fileID: 1114094147405540106}
  SkillDesc: {fileID: 5978630159876944380}
  btnPS: {fileID: 7011832348808780968}
@@ -5616,7 +5617,7 @@
    - target: {fileID: 8530610553866603046, guid: e30e86a0b720a524384db91a4eb22bcb,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 259.83737
      value: -0.000061035156
      objectReference: {fileID: 0}
    - target: {fileID: 8530610554782125076, guid: e30e86a0b720a524384db91a4eb22bcb,
        type: 3}
Assets/Scenes/Levels/Battle/Endless2D.unity
@@ -4690,21 +4690,6 @@
  m_Modification:
    m_TransformParent: {fileID: 1340671931}
    m_Modifications:
    - target: {fileID: 1864109698340928006, guid: 29da21b318f42054db30c52123aa4dbf,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: -15
      objectReference: {fileID: 0}
    - target: {fileID: 1864109698340928006, guid: 29da21b318f42054db30c52123aa4dbf,
        type: 3}
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4623057512524248738, guid: 29da21b318f42054db30c52123aa4dbf,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: -0.000061035156
      objectReference: {fileID: 0}
    - target: {fileID: 4623057512704841786, guid: 29da21b318f42054db30c52123aa4dbf,
        type: 3}
      propertyPath: m_Name
Assets/Scripts/Event/EventType.cs
@@ -118,8 +118,6 @@
        OpenAllTowerGrid,
        // 关闭了精灵升级界面
        ElfUpgradePanelClosed,
        // 不够开塔,也不够买塔
        SetTowerGridOpenRed,
    }
Assets/Scripts/TowerDefense/UI/EndlessTowerGridOpen.cs
@@ -5,6 +5,7 @@
using TowerDefense.Towers.Placement;
using UnityEngine;
using UnityEngine.UI;
using DG.Tweening;
/// <summary>
/// 当前类用于开启新的TowerPlacementGrid,用于无尽模式。当前类附加在对应的购买开启按钮上。
@@ -38,7 +39,6 @@
    void Start()
    {
        bWaitOpen = false;
        EventCenter.Ins.Add((int)KTGMGemClient.EventType.SetTowerGridOpenRed, SetRed);
    }
    /// <summary>
@@ -76,16 +76,6 @@
            cashText.color = new Color(0.5f, 0.5f, 0.5f);
    }
    private void SetRed()
    {
        int result;
        int.TryParse(cashText.text.ToString(), out result);
        int current = EndlessLevelManager.instance.Currency.currentCurrency;
        if (current < result)
            cashText.color = new Color(1f, 0f, 0f);
    }
    public void SetBuyBtnInfo(int x, int y, TowerPlacementGridEndless tpg)
    {
        gridX = x;
@@ -118,6 +108,9 @@
            if (EndlessLevelManager.instance.Currency.currentCurrency < cashToOpen)
            {
                AudioSourceManager.Ins.Play(AudioEnum.UIDisable);
                cashText.color = new Color(1f, 0f, 0f);
                DOTween.To(() => cashText.color, (Color v) => cashText.color = v, cashText.color, 0.2f)
                    .OnComplete(CheckCurrencyEnough);
                return;
            }
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
@@ -2008,7 +2008,7 @@
        /// <summary>
        /// 随机放置Tower按钮禁止使用,灰掉.
        /// </summary>
        protected void disableRandomTowerBtn()
        public void disableRandomTowerBtn()
        {
            randomTowerBtn.GetComponent<EndlessRandomTower>().ChangeBtnClick();
            //randomTowerBtn.interactable = false;
@@ -2023,7 +2023,7 @@
        /// <summary>
        /// 随机购买Tower的按钮重设置为有效.
        /// </summary>
        protected void enableRandomTowerBtn()
        public void enableRandomTowerBtn()
        {
            // ATTENTION TO FIX: 再次判断是因为有的地方是直接调用
            if ((TowerPrice.instance.currentTowerPrice > EndlessLevelManager.instance.Currency.currentCurrency) ||
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
@@ -8,6 +8,7 @@
using UnityEngine.UI;
using TMPro;
using KTGMGemClient;
using DG.Tweening;
public class EndlessRandomTower : Singleton<EndlessRandomTower>
{
@@ -18,6 +19,9 @@
    /// 购买二级宝石的按钮贴图.
    /// </summary>
    public Sprite buyBtnLevelUp;
    [SerializeField]
    private TextMeshProUGUI cashText;
    protected bool bSetBuyLvlUp;
@@ -225,7 +229,9 @@
        if (EndlessGameUI.instance.tdBuyDisable)
        {
            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.SetTowerGridOpenRed);
            cashText.color = new Color(1f, 0f, 0f);
            DOTween.To(() => cashText.color, (Color v) => cashText.color = v, cashText.color, 0.2f)
                .OnComplete(CheckCurrencyEnough);
            return;
        }
@@ -278,6 +284,18 @@
    }
    private void CheckCurrencyEnough()
    {
        int result;
        int.TryParse(cashText.text.ToString(), out result);
        int current = EndlessLevelManager.instance.Currency.currentCurrency;
        if (current >= result)
            EndlessGameUI.instance.enableRandomTowerBtn();
        else
            EndlessGameUI.instance.disableRandomTowerBtn();
    }
    private List<string> towerNameLis = new List<string>();//用来判断是否是首次购买宝石
    /// <summary>