GemBattle.git - Gitblit

			@@ -131,7 +131,7 @@
			/// </summary>
			protected TextMeshProUGUI towerPriceText;

			protected TextMeshProUGUI towerPriceText1;
			//protected TextMeshProUGUI towerPriceText1;

			protected bool tdBuyDisable = false;

			@@ -705,7 +705,7 @@

			if (sTower && sTower != towerToMove)
			{
			if (towerToMove && sTower.towerFeature == EFeatureTower.NULL && towerToMove.towerFeature == EFeatureTower.NULL && sTower.bInAttackMode == towerToMove.bInAttackMode)
			if (towerToMove && sTower.towerFeature == EFeatureTower.NULL && towerToMove.towerFeature == EFeatureTower.NULL && sTower.bInAttackMode && towerToMove.bInAttackMode)
			return true;
			}
			}
			@@ -849,6 +849,7 @@

			// 让所有兵线上已经生成的所有agent播放一个死亡动画然后销毁
			WaveLineAgentInsMgr[] waveLineAgentIns = AgentInsManager.instance.GetWaveLineList();
			GameOver();

			for (int i = 0; i < waveLineAgentIns.Length; ++i)
			{
			@@ -858,7 +859,6 @@
			}
			}

			GameOver();
			overTimer = new Timer(1.2f, SafelyCallGameOverEvent);
			}

			@@ -882,6 +882,13 @@
			{
			if (m_CurrentTower.controller.towerFeature == EFeatureTower.NULL)
			{
			// if (m_CurrentArea != null && m_CurrentTower.controller.gridPosition.y >= 2)
			// {
			// //修改为只要开启格子都可以放
			// (m_CurrentArea as TowerPlacementGridEndless).CheckCanPlaceUpdate(m_CurrentTower.controller.gridPosition.x, m_CurrentTower.controller.gridPosition.y, false, "");
			// //(m_CurrentArea as TowerPlacementGridEndless).PlayPS(allPSTowerP);
			// }
			return;
			List<IntVector2> allTowerP = null;//排除不能合成的
			// List<IntVector2> allPSTowerP = new List<IntVector2>();//需要播放升级动画的

			@@ -944,6 +951,8 @@
			}
			}

			Tower checkTowerPlaceTower;//移动时候查看鼠标是否检测到有塔
			Tower bInAttackModeTower;//在合成区的塔
			/// <summary>
			/// 检查符合条件的塔
			/// </summary>
			@@ -953,37 +962,92 @@
			//return;
			if (m_CurrentArea != null && m_CurrentArea is TowerPlacementGridEndless)
			{
			checkTowerPlaceTower = isFreeAttackGridOnDrag(pointerInfo);
			//下面是为了设置一个虚拟的塔
			if (isFreeAttackGridOnDrag(pointerInfo) && m_CurrentTower.controller.towerFeature == EFeatureTower.NULL)
			if (checkTowerPlaceTower != null)
			{
			//Debug.Log("得到了一个空的塔位");
			if (m_CurrentTower.controller.towerFeature == EFeatureTower.NULL)
			{
			if (checkTowerPlaceTower.bInAttackMode)
			{
			//鼠标检测到了塔
			(m_CurrentArea as TowerPlacementGridEndless).CheckCanPlaceUpdate(m_GridPosition.x, m_GridPosition.y, false, "");
			}
			else
			{
			if (!towerToMove.bInAttackMode)
			{
			//没有上阵
			if (bInAttackModeTower == null)
			{
			bInAttackModeTower = checkTowerPlaceTower;
			bInAttackModeTower.currentTowerLevel.SetCanPlace(true);
			}
			else if (bInAttackModeTower != checkTowerPlaceTower)
			{

			(m_CurrentArea as TowerPlacementGridEndless).CheckCanPlaceUpdate(m_GridPosition.x, m_GridPosition.y, false, "");
			//if(temporaryMat)
			bInAttackModeTower.currentTowerLevel.SetCanPlace(false);
			bInAttackModeTower = checkTowerPlaceTower;
			bInAttackModeTower.currentTowerLevel.SetCanPlace(true);
			}
			}

			}
			}
			else if (m_CurrentTower.controller.towerFeature == EFeatureTower.Skill_Fire \|\| m_CurrentTower.controller.towerFeature == EFeatureTower.Skill_Bomb)
			{
			//技能宝石没有上阵
			if (bInAttackModeTower == null)
			{
			bInAttackModeTower = checkTowerPlaceTower;
			bInAttackModeTower.currentTowerLevel.SetCanPlace(true);
			}
			else if (bInAttackModeTower != checkTowerPlaceTower)
			{

			bInAttackModeTower.currentTowerLevel.SetCanPlace(false);
			bInAttackModeTower = checkTowerPlaceTower;
			bInAttackModeTower.currentTowerLevel.SetCanPlace(true);
			}
			}
			}
			else if ((m_GridPosition.x >= 0) && (m_GridPosition.y >= 0))
			{
			//查看是否是一个空格子
			if (m_CurrentArea.isFreeAtackPos(m_GridPosition.x, m_GridPosition.y))
			{
			(m_CurrentArea as TowerPlacementGridEndless).CheckCanPlaceUpdate(m_GridPosition.x, m_GridPosition.y, true, towerToMove.towerName);
			if (m_CurrentTower.controller.towerFeature == EFeatureTower.NULL)
			{
			//空格子
			(m_CurrentArea as TowerPlacementGridEndless).CheckCanPlaceUpdate(m_GridPosition.x, m_GridPosition.y, true, towerToMove.towerName);
			}
			}
			else
			{
			(m_CurrentArea as TowerPlacementGridEndless).CloseCanPlace();
			CloseCanPlace();
			}
			}
			else
			{
			(m_CurrentArea as TowerPlacementGridEndless).CloseCanPlace();
			CloseCanPlace();
			}
			}
			else
			{
			//Debug.Log("什么情况");
			if (m_CurrentTower.controller.towerFeature == EFeatureTower.NULL)
			{
			dragTowerPlacement.CloseCanPlace();
			}
			}
			}

			void CloseCanPlace()
			{
			dragTowerPlacement.CloseCanPlace();
			if (bInAttackModeTower != null)
			{
			bInAttackModeTower.currentTowerLevel.SetCanPlace(false);
			bInAttackModeTower = null;
			}
			}

			@@ -994,24 +1058,45 @@
			/// </summary>
			/// <param name="pinfo"></param>
			/// <returns></returns>
			protected bool isFreeAttackGridOnDrag(PointerInfo pinfo)
			protected Tower isFreeAttackGridOnDrag(PointerInfo pinfo)
			{
			// 判断格子上的塔防:
			UIPointer pointer = WrapPointer(pinfo);
			Tower sTower = PickTowerInGrid(pointer);
			if (sTower != null)
			{
			if (sTower.bInAttackMode && towerToMove && sTower.currentLevel == dragTowerLevel && sTower.towerName == towerToMove.towerName)

			// if (towerToMove && sTower.currentLevel == dragTowerLevel && sTower.towerName == towerToMove.towerName)
			// {
			// //说明可以合成
			// return sTower;
			// }
			// else
			// {
			// return null;
			// }

			if (towerToMove)
			{
			//说明可以合成
			return true;
			if (towerToMove.bInAttackMode)
			{
			return sTower;
			}
			else
			{
			if (sTower.currentLevel == dragTowerLevel && sTower.towerName == towerToMove.towerName)
			{
			//说明可以合成
			return sTower;
			}
			}
			}
			else
			{
			return false;
			return null;
			}
			}
			return false;
			return null;
			}

			#endregion
			@@ -1051,7 +1136,6 @@
			if (!TryPlaceTower(pointerInfo, false, true))
			{
			CancelPlaceTower(pointerInfo);

			Debug.Log("这里需要返回原位");
			return;
			}
			@@ -1077,26 +1161,38 @@
			IntVector2 v1 = new IntVector2(towerToMove.gridPosition.x, towerToMove.gridPosition.y);
			IntVector2 v2 = new IntVector2(sTower.gridPosition.x, sTower.gridPosition.y);

			Tower newTower1 = PlaceTowerForce(EndlessRandomTower.instance.getTowerByName(sTower.towerName), v1, sTower.currentLevel + 1, false);
			Tower newTower2 = PlaceTowerForce(m_CurrentTower.controller, v2, towerToMove.currentLevel + 1, false);

			if (towerToMove != null)
			if (m_CurrentArea == null)
			{
			delTower(towerToMove);
			CancelGhostPlacement();
			towerToMove.showTower(true);
			towerToMove.Sell();
			towerToMove = null;
			}
			else
			{
			Tower newTower1 = PlaceTowerForce(EndlessRandomTower.instance.getTowerByName(sTower.towerName), v1, sTower.currentLevel + 1, false);
			Tower newTower2 = PlaceTowerForce(m_CurrentTower.controller, v2, towerToMove.currentLevel + 1, false);

			delTower(sTower);
			sTower.showTower(true);
			sTower.Sell();
			sTower = null;
			if (towerToMove != null)
			{
			delTower(towerToMove);
			towerToMove.showTower(true);
			towerToMove.Sell();
			towerToMove = null;
			}

			CancelGhostPlacement();
			delTower(sTower);
			sTower.showTower(true);
			sTower.Sell();
			sTower = null;

			newTower1.placementArea.Occupy(newTower1.gridPosition, newTower1.dimensions);
			newTower2.placementArea.Occupy(newTower2.gridPosition, newTower2.dimensions);
			CancelGhostPlacement();

			newTower1.placementArea.Occupy(newTower1.gridPosition, newTower1.dimensions);
			newTower2.placementArea.Occupy(newTower2.gridPosition, newTower2.dimensions);

			//强制交换塔的时候检查自身充能条
			newTower1.CheckCtrl();
			newTower2.CheckCtrl();
			}
			}
			}
			// 当前是Skill塔位的状态.
			@@ -1141,7 +1237,6 @@

			if (playEffect)
			PlayUpgradeEffect(createdTower);

			addTower(createdTower);
			Destroy(currentTower.gameObject);

			@@ -1210,6 +1305,7 @@
			if (towerToMove)
			{
			towerToMove.showTower(true);
			towerToMove.CheckCtrl();

			// 处理复制骰子：
			if (towerToMove.towerFeature == EFeatureTower.CopyCat)
			@@ -1267,9 +1363,7 @@
			return false;
			}

			BuyTower(pointer, force, zeroCost);

			return true;
			return BuyTower(pointer, force, zeroCost);
			}

			/// <summary>
			@@ -1477,9 +1571,9 @@
			/// Throws exception when not in a build mode or when tower is not a valid position
			/// </exception>
			/// </summary>
			public void BuyTower(UIPointer pointer, bool force = false, bool zeroCost = false)
			public bool BuyTower(UIPointer pointer, bool force = false, bool zeroCost = false)
			{
			if (!isBuilding) return;
			if (!isBuilding) return false;

			// 判断是否格子上重复放置塔防
			if (!m_CurrentTower \|\| !IsGhostAtValidPosition())
			@@ -1511,11 +1605,11 @@
			if (!pointer.raycast.HasValue \|\| pointer.raycast.Value.collider == null)
			{
			CancelGhostPlacement();
			return;
			return false;
			}
			PlaceGhost(pointer);
			}
			return;
			return true;
			}

			// 这是判断是否超出了格子
			@@ -1523,7 +1617,7 @@
			if (!pointer.raycast.HasValue \|\| pointer.raycast.Value.collider == null)
			{
			CancelGhostPlacement();
			return;
			return false;
			}

			int cost = m_CurrentTower.controller.purchaseCost;
			@@ -1534,6 +1628,8 @@
			{
			PlaceGhost(pointer);
			}

			return true;
			}

			/// <summary>
			@@ -1810,16 +1906,16 @@
			if (!towerPriceText)
			{
			towerPriceText = randomTowerBtn.transform.Find("cashText").GetComponent<TextMeshProUGUI>();
			towerPriceText1 = SkillTowerBtn.transform.Find("cashText").GetComponent<TextMeshProUGUI>();
			//towerPriceText1 = SkillTowerBtn.transform.Find("cashText").GetComponent<TextMeshProUGUI>();
			if (towerPriceText)
			towerPriceText.text = tpMgr.currentTowerPrice.ToString();
			if (towerPriceText1)
			towerPriceText1.text = tpMgr.currentTowerPrice.ToString();
			// if (towerPriceText1)
			// towerPriceText1.text = tpMgr.currentTowerPrice.ToString();
			}
			else
			{
			towerPriceText.text = tpMgr.currentTowerPrice.ToString();
			towerPriceText1.text = tpMgr.currentTowerPrice.ToString();
			//towerPriceText1.text = tpMgr.currentTowerPrice.ToString();
			}

			// 无法支付新的塔防价格，按钮变灰.
			@@ -1839,7 +1935,7 @@
			if (towerPriceText)
			{
			towerPriceText.color = new Color(0.5f, 0.5f, 0.5f);
			towerPriceText1.color = new Color(0.5f, 0.5f, 0.5f);
			//towerPriceText1.color = new Color(0.5f, 0.5f, 0.5f);
			}
			tdBuyDisable = true;
			}
			@@ -1857,7 +1953,7 @@
			if (towerPriceText)
			{
			towerPriceText.color = new Color(1.0f, 1.0f, 1.0f);
			towerPriceText1.color = new Color(1.0f, 1.0f, 1.0f);
			//towerPriceText1.color = new Color(1.0f, 1.0f, 1.0f);
			}

			if (randomTowerBtn)