Merge commit '4a083f2f3d8baf1c2630b3717d62904edcc8e24a' into master

chenxin

2020-11-14 62b2779db75575bebd80ffac74fc3f25b5b994fa

 Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs

@@ -78,6 +78,8 @@
        /// </summary>
        private EndlessTowerGridOpen[,] m_arrTGO;

        public GameObject[] TowerGridOpenObjArr;

        private float[,] m_arrCoinGenTime;

        /// <summary>
@@ -826,9 +828,17 @@
            if (!arrTowerEnergyEffect[x, dy]) return;

            if (play)
            {
                if (!arrTowerEnergyEffect[x, dy].gameObject.activeSelf)
                    arrTowerEnergyEffect[x, dy].gameObject.SetActive(true);
                arrTowerEnergyEffect[x, dy].Play();
            }
            else
            {

                arrTowerEnergyEffect[x, dy].Stop();
                arrTowerEnergyEffect[x, dy].gameObject.SetActive(false);
            }
        }

        /// <summary>
@@ -851,8 +861,8 @@
        {
            PlacementTile tileToUse;
#if UNITY_STANDALONE
         //tileToUse = placementTilePrefab;
         tileToUse = placementTilePrefabMobile;
            //tileToUse = placementTilePrefab;
            tileToUse = placementTilePrefabMobile;
#else
            tileToUse = placementTilePrefabMobile;
#endif
@@ -953,11 +963,15 @@
        /// </summary>
        /// <param name="x"></param>
        /// <param name="y"></param>
        public void CheckCanPlaceUpdate(int x, int y)
        public void CheckCanPlaceUpdate(int x, int y, bool isEmpty, string towerName)
        {
            CloseCanPlace();
            currentCanPlace = m_Tiles[x, y];
            currentCanPlace.SetSelect(true);
            if (isEmpty)
            {
                currentCanPlace.SetTowerVirtualshadow(towerName);
            }
        }

        /// <summary>