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

liuzhiwei

2020-11-18 254c3e4d509c586dc6620c681004eefd5d86182c

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

@@ -1028,14 +1028,14 @@
                    if (m_arrGridType[ix, y] == PlacementGridType.EGridOpen)
                    {
                        canPlace = true;
                        for (int i = 0; i < allTowerP.Count; i++)
                        {
                            if (allTowerP[i].x == ix && allTowerP[i].y == y)
                            {
                                canPlace = false;
                                break;
                            }
                        }
                        // for (int i = 0; i < allTowerP.Count; i++)
                        // {
                        //     if (allTowerP[i].x == ix && allTowerP[i].y == y)
                        //     {
                        //         canPlace = false;
                        //         break;
                        //     }
                        // }
                        m_Tiles[ix, y].CheckCanPlace(canPlace);
                    }
                }