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

liuzhiwei

2020-12-26 56d95fa59a9f6dc12d0fc0723ea449e5b317f994

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

@@ -437,6 +437,11 @@
            return true;
        }

        public PlacementTile GetOneTile(int x, int y)
        {
            return m_Tiles[x, y];
        }

        /// <summary>
        /// Returns the world coordinates corresponding to a grid location.
        /// 把格子坐标转换成世界坐标
@@ -709,8 +714,8 @@
                    EndlessTowerGridOpen tgo = buyButton.GetComponent<EndlessTowerGridOpen>();
                    if (tgo)
                    {
                        tgo.SetBuyBtnInfo(x, y, this);
                        tgo.cashText.SetText(TowerPlacementGridEndless.GRID_OPENCASH.ToString());
                        tgo.SetBuyBtnInfo(x, y, this,TowerPlacementGridEndless.GRID_OPENCASH.ToString());

                        m_arrTGO[x, y] = tgo;
                        tgo.CheckCurrencyEnough();
                    }