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

liuzhiwei

2020-11-25 925d4b4b286a5d8dff4b62be0ceb25db0c45fedc

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

@@ -224,9 +224,9 @@
    /// </summary>
    public void onClick(EFeatureTower towerType)
    {
        if (GameConfig.IsNewbie && !GameConfig.CanBuyNewTower)
        if (GameConfig.IsNewbie)
        {
            AudioSourceManager.Ins.Play(AudioEnum.UIDisable);
            AudioSourceManager.Ins.Play(AudioEnum.UI);

            return;
        }
@@ -238,41 +238,44 @@
        if (!newTower)
            throw new Exception("未能成功产生Tower");

        if (newTower.towerFeature == EFeatureTower.NULL)
        {
            string tmpTowerName = newTower.towerName;
            towerNameLis.Add(tmpTowerName);
            int count = 0;
            bool isFirstBuy = true;
            for (int i = 0; i < towerNameLis.Count; i++)
            {
                if (towerNameLis[i] == tmpTowerName)
                {
                    count++;
                    if (count == 2)
                    {
                        isFirstBuy = false;
                        break;
                    }
                }
            }
        RandomPlaceTower(newTower, -1, -1, -1, -1, true);

            if (isFirstBuy)
            {
                //Debug.Log("首次购买：" + tmpTowerName);
        // if (newTower.towerFeature == EFeatureTower.NULL)
        // {
        //     string tmpTowerName = newTower.towerName;
        //     towerNameLis.Add(tmpTowerName);
        //     int count = 0;
        //     bool isFirstBuy = true;
        //     for (int i = 0; i < towerNameLis.Count; i++)
        //     {
        //         if (towerNameLis[i] == tmpTowerName)
        //         {
        //             count++;
        //             if (count == 2)
        //             {
        //                 isFirstBuy = false;
        //                 break;
        //             }
        //         }
        //     }

            }
            else
            {
                //Debug.Log("购买了多次了：" + tmpTowerName);
            }
            RandomPlaceTower(newTower, -1, -1, -1, -1, isFirstBuy);
        //     if (isFirstBuy)
        //     {
        //         //Debug.Log("首次购买：" + tmpTowerName);

        }
        else
        {
            RandomPlaceTower(newTower, -1, -1, -1, -1, false);
        }
        //     }
        //     else
        //     {
        //         //Debug.Log("购买了多次了：" + tmpTowerName);
        //     }
        //     RandomPlaceTower(newTower, -1, -1, -1, -1, isFirstBuy);

        // }
        // else
        // {
        //     RandomPlaceTower(newTower, -1, -1, -1, -1, false);
        // }

    }

    private List<string> towerNameLis = new List<string>();//用来判断是否是首次购买宝石