From 69e0fea6c92fd4e153d45e5f26ef89baecf0405a Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 19 Nov 2020 08:51:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs b/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
index 6ca6cb3..7b486cc 100644
--- a/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
+++ b/Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs
@@ -892,11 +892,9 @@
for (int tx = 0; tx < dimensions.x; tx++)
{
- m_arrGridType[tx, sy] = PlacementGridType.EGridWaitBuy;
+ m_arrGridType[tx, sy] = PlacementGridType.EGridOpen;
m_arrGridType[tx, sy - 1] = PlacementGridType.EGridWaitBuy;
}
- // 设置塔位默认开启，后面需要根据配置来
- m_arrGridType[2, 3] = PlacementGridType.EGridOpen;
++GameConfig.EndlessOpenAttackTowerCount;
}
@@ -1028,12 +1026,15 @@
if (m_arrGridType[ix, y] == PlacementGridType.EGridOpen)
{
canPlace = true;
- for (int i = 0; i < allTowerP.Count; i++)
+ if (allTowerP != null)
{
- if (allTowerP[i].x == ix && allTowerP[i].y == y)
+ for (int i = 0; i < allTowerP.Count; i++)
{
- canPlace = false;
- break;
+ if (allTowerP[i].x == ix && allTowerP[i].y == y)
+ {
+ canPlace = false;
+ break;
+ }
}
}
m_Tiles[ix, y].CheckCanPlace(canPlace);
--
Gitblit v1.9.1