From fe59d1a97e80284315bcdfa18a49059b38dfd137 Mon Sep 17 00:00:00 2001 From: wangguan <wangguan@kt007.com> Date: Wed, 16 Dec 2020 14:28:09 +0800 Subject: [PATCH] 掉血修改 --- Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs | 386 ++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 296 insertions(+), 90 deletions(-) diff --git a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs index b3053e9..8c1d17c 100644 --- a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs +++ b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs @@ -1,11 +1,8 @@ -using System.Globalization; -using Core.Health; +using Core.Health; using Core.Input; using Core.Utilities; -using DG.Tweening; using JetBrains.Annotations; using System; -using System.Collections; using System.Collections.Generic; using TMPro; using TowerDefense.Level; @@ -15,7 +12,6 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using TowerDefense.Nodes; -using TowerDefense.Affectors; using KTGMGemClient; namespace TowerDefense.UI.HUD @@ -127,13 +123,28 @@ public TextMoveDoTween bloodCrit; /// <summary> + /// 减速飘字 + /// </summary> + public Image SlowDownWord; + + /// <summary> + /// 暴击飘字 + /// </summary> + public Image CritWord; + + /// <summary> + /// 冰冻飘字 + /// </summary> + public Image FrostWord; + + public Image RestrainWord; + + /// <summary> /// 购买塔防按钮上的Text. /// </summary> protected TextMeshProUGUI towerPriceText; - //protected TextMeshProUGUI towerPriceText1; - - protected bool tdBuyDisable = false; + public bool tdBuyDisable { get; protected set; } = false; /// <summary> /// 鼠标在移动一个Tower之前,要隐藏的Tower数据和指针。 @@ -190,6 +201,7 @@ return m_CurrentTower != null; } } + // TowerList用于简单记录相关的数据 protected List<Tower> m_listTower = new List<Tower>(); @@ -336,6 +348,25 @@ return lt; } return null; + } + + /// <summary> + /// 根据塔位索引位置,查找位置上是否有对应的塔防数据。 + /// </summary> + /// <param name="x"></param> + /// <param name="y"></param> + /// <returns></returns> + public int GetTowerNum() + { + int num = 0; + foreach (Tower lt in m_listTower) + { + if (lt.gridPosition.y == 0 || lt.gridPosition.y == 1) + { + num++; + } + } + return num; } public bool towerInList(Tower t) @@ -571,7 +602,7 @@ if (tower.towerName != towerOld.towerName) continue; - newT = Instantiate(tower, transform); + newT = tower; break; } @@ -631,7 +662,7 @@ if ((m_GridPosition.x >= 0) && (m_GridPosition.y >= 0)) { - if (m_CurrentArea.isFreeAtackPos(m_GridPosition.x, m_GridPosition.y)) + if ((m_CurrentArea as TowerPlacementGridEndless).isFreeAtackPos(m_GridPosition.x, m_GridPosition.y)) { return true; } @@ -679,6 +710,10 @@ // 判断格子上的塔防: UIPointer pointer = WrapPointer(pinfo); Tower sTower = PickTowerInGrid(pointer); + + // 泡泡禁锢状态不允许合并 + if (sTower && sTower.IsStartBondage) return false; + if (sTower && sTower != towerToMove) { int testLvl = dragTowerLevel; @@ -703,9 +738,12 @@ UIPointer pointer = WrapPointer(pinfo); Tower sTower = PickTowerInGrid(pointer); + // 泡泡禁锢状态不允许置换 + if (sTower && sTower.IsStartBondage) return false; + if (sTower && sTower != towerToMove) { - if (towerToMove && sTower.towerFeature == EFeatureTower.NULL && towerToMove.towerFeature == EFeatureTower.NULL && sTower.bInAttackMode && towerToMove.bInAttackMode) + if (towerToMove) return true; } } @@ -754,6 +792,29 @@ } } return ""; + } + + /// <summary> + /// 提升所有塔的等级,如果现在塔的等级 < level,设置等级为 level,如果 > level 不做改变 + /// </summary> + /// <param name="level">从0开始</param> + public void UpgradeAllTowerMinLevel(int level) + { + if (level < 0 || level > ElfUpgradeData.MaxTowerLevel - 1) return; + + for (int i = 0; i < m_listTower.Count; ++i) + { + if (m_listTower[i].currentLevel < level) + { + m_listTower[i].currentLevel = level; + m_listTower[i].CurrentTowerLevel.SetShowLevel(level + 1); + m_listTower[i].CurrentTowerLevel.SetScale(level + 1); + PlayUpgradeEffect(m_listTower[i]); + } + } + GameConfig.IsUpgradeTowerLevel = true; + UpdateMinLevelArr(); + EndlessRandomTower.instance.UpdateDescDisplay(); } /// <summary> @@ -863,6 +924,7 @@ EndlessBossSkillManager.instance.ClearSkillList(); EndlessBossHPManager.instance.SwitchHP(true); EndlessBossHPManager.instance.SetCurrentHP(0); + EndlessLevelManager.instance.WaveManager.HideTunel(); // 停止所有兵线的出兵 for (int i = 0; i < TotalWaveLines; ++i) @@ -986,9 +1048,12 @@ if (m_CurrentArea != null && m_CurrentArea is TowerPlacementGridEndless) { checkTowerPlaceTower = isFreeAttackGridOnDrag(pointerInfo); + //下面是为了设置一个虚拟的塔 if (checkTowerPlaceTower != null) { + Debug.Log(checkTowerPlaceTower.name); + if (m_CurrentTower.controller.towerFeature == EFeatureTower.NULL) { if (checkTowerPlaceTower.bInAttackMode) @@ -1014,24 +1079,11 @@ 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); - } + m_CurrentTower.transform.position = (m_CurrentArea as TowerPlacementGridEndless).GridToWorld(checkTowerPlaceTower.gridPosition, m_CurrentTower.controller.dimensions); + } } else if ((m_GridPosition.x >= 0) && (m_GridPosition.y >= 0)) @@ -1043,6 +1095,9 @@ { //空格子 (m_CurrentArea as TowerPlacementGridEndless).CheckCanPlaceUpdate(m_GridPosition.x, m_GridPosition.y, true, towerToMove.towerName); + + m_CurrentTower.transform.position = (m_CurrentArea as TowerPlacementGridEndless).GridToWorld(m_GridPosition, m_CurrentTower.controller.dimensions); + } } else @@ -1064,7 +1119,7 @@ } } - void CloseCanPlace() + public void CloseCanPlace() { dragTowerPlacement.CloseCanPlace(); if (bInAttackModeTower != null) @@ -1075,6 +1130,101 @@ } TowerPlacementGridEndless dragTowerPlacement; + + public void CheckTowerPlaceNew(PointerInfo pointerInfo) + { + //return; + if (m_CurrentArea != null && m_CurrentArea is TowerPlacementGridEndless) + { + if ((m_GridPosition.x >= 0) && (m_GridPosition.y >= 0)) + { + if (m_GridPosition.y == 0 || m_GridPosition.y == 1) + { + //Debug.Log("未上阵区域,不管有没有塔,都强行吸附"); + (m_CurrentArea as TowerPlacementGridEndless).CheckCanPlaceUpdate(m_GridPosition.x, m_GridPosition.y, true, ""); + + m_CurrentTower.transform.position = (m_CurrentArea as TowerPlacementGridEndless).GridToWorld(m_GridPosition, m_CurrentTower.controller.dimensions); + + } + else if (m_GridPosition.y == 2 || m_GridPosition.y == 3) + { + //Debug.Log("已上阵区域,如果是空格子就强行吸附,先判断是否有塔"); + + checkTowerPlaceTower = isFreeAttackGridOnDrag(pointerInfo); + + if (checkTowerPlaceTower != null) + { + //Debug.Log(checkTowerPlaceTower.name); + + 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) + { + + bInAttackModeTower.CurrentTowerLevel.SetCanPlace(false); + bInAttackModeTower = checkTowerPlaceTower; + bInAttackModeTower.CurrentTowerLevel.SetCanPlace(true); + } + } + } + m_CurrentTower.transform.position = (m_CurrentArea as TowerPlacementGridEndless).GridToWorld(checkTowerPlaceTower.gridPosition, m_CurrentTower.controller.dimensions); + } + } + else if ((m_CurrentArea as TowerPlacementGridEndless).isFreeAtackPos(m_GridPosition.x, m_GridPosition.y)) + { + //Debug.Log("空格子"); + + (m_CurrentArea as TowerPlacementGridEndless).CheckCanPlaceUpdate(m_GridPosition.x, m_GridPosition.y, true, towerToMove.towerName); + + m_CurrentTower.transform.position = (m_CurrentArea as TowerPlacementGridEndless).GridToWorld(m_GridPosition, m_CurrentTower.controller.dimensions); + + } + else + { + + //Debug.Log($"上阵区域 m_GridPosition:{m_GridPosition.x} {m_GridPosition.y} m_CurrentTower.controller.gridPosition:{m_CurrentTower.controller.gridPosition.x} {m_CurrentTower.controller.gridPosition.y}"); + + if (m_GridPosition == towerToMove.gridPosition) + { + //Debug.Log("在原来的地方"); + + (m_CurrentArea as TowerPlacementGridEndless).CheckCanPlaceUpdate(m_GridPosition.x, m_GridPosition.y, true, towerToMove.towerName); + + m_CurrentTower.transform.position = towerToMove.position; + } + else + { + CloseCanPlace(); + + //Debug.Log("上阵区域,没有开放的塔位"); + } + } + } + } + + } + else + { + dragTowerPlacement.CloseCanPlace(); + + } + } + /// <summary> /// 目标位置是否是可攻击属性的空塔位 @@ -1088,31 +1238,20 @@ Tower sTower = PickTowerInGrid(pointer); if (sTower != null) { - - // if (towerToMove && sTower.currentLevel == dragTowerLevel && sTower.towerName == towerToMove.towerName) - // { - // //说明可以合成 - // return sTower; - // } - // else - // { - // return null; - // } - if (towerToMove) { - if (towerToMove.bInAttackMode) - { - return sTower; - } - else - { - if (sTower.currentLevel == dragTowerLevel && sTower.towerName == towerToMove.towerName) - { - //说明可以合成 - return sTower; - } - } + return sTower; + // if (towerToMove.bInAttackMode) + // { + // } + // else + // { + // if (sTower.currentLevel == dragTowerLevel && sTower.towerName == towerToMove.towerName) + // { + // //说明可以合成 + // return sTower; + // } + // } } else { @@ -1125,6 +1264,15 @@ #endregion /// <summary> + /// 推拽结束,如果判断HasTower==true 就强行释放 + /// </summary> + public void EndDragCancelPlaceTower() + { + Debug.Log("强行释放了m_CurrentTower"); + CancelPlaceTower(null); + } + + /// <summary> /// 拖动一个Tower之后,松开鼠标或者EndDrag. /// 1: 目标点可合成,则直接合成。 /// 2: 目标点不管是空白,还是不能放置Tower,都要让当前的Tower返回到原来的TowerPlace @@ -1132,7 +1280,6 @@ /// <param name="pointerInfo"></param> public void onEndTowerDrag(PointerInfo pointerInfo) { - bool bSkill = false; if (temporaryMat != null) { //移动虚像隐藏 @@ -1146,8 +1293,10 @@ } if (m_CurrentTower.controller.towerFeature != EFeatureTower.NULL) - bSkill = true; - + { + Debug.LogError("只能移动3种塔"); + return; + } if (GameConfig.IsNewbie) { bool isCanChange = false; @@ -1173,11 +1322,14 @@ // 判断目标位置是否有Tower且类型和等级一致,如果没有,则GhostTower删除,原Tower显示。 if (isValidateCombineTarget(pointerInfo)) { + //Debug.Log("isValidateCombineTarget"); TryPlaceTower(pointerInfo); EndlessRandomTower.instance.UpdateDescDisplay(); } - else if (isFreeAttackGrid(pointerInfo) && !bSkill) + else if (isFreeAttackGrid(pointerInfo)) { + //Debug.Log("isFreeAttackGrid:" + m_GridPosition); + if (!TryPlaceTower(pointerInfo, false)) { CancelPlaceTower(pointerInfo); @@ -1193,30 +1345,14 @@ towerToMove.Sell(); towerToMove = null; } + if (m_CurrentTower != null && m_CurrentTower.controller != null) + Destroy(m_CurrentTower.controller.gameObject); } else if (EndlessLevelManager.instanceExists && IsSubstitute(pointerInfo)) { - CheckCanChangePos(pointerInfo); - } - // 当前是Skill塔位的状态. - else if (bSkill) - { - if (SkillPlayEndDrag(pointerInfo)) - { - // 先释放掉当前的Ghost塔防. - CancelGhostPlacement(); + //Debug.Log("IsSubstitute"); - // 删除towerToMove,确保塔防数据不再出现多个 - if (towerToMove != null) - { - delTower(towerToMove); - towerToMove.showTower(true); - towerToMove.Sell(); - towerToMove = null; - } - } - else - CancelPlaceTower(pointerInfo); + CheckCanChangePos(pointerInfo); } else CancelPlaceTower(pointerInfo); @@ -1231,7 +1367,8 @@ if (sTower == null) return false; - if (sTower.bInAttackMode == towerToMove.bInAttackMode) + Debug.Log("开始检测是否可以交换塔"); + //if (sTower.bInAttackMode == towerToMove.bInAttackMode) { IntVector2 v1 = new IntVector2(towerToMove.gridPosition.x, towerToMove.gridPosition.y); IntVector2 v2 = new IntVector2(sTower.gridPosition.x, sTower.gridPosition.y); @@ -1268,6 +1405,9 @@ //强制交换塔的时候检查自身充能条 newTower1.CheckCtrl(); newTower2.CheckCtrl(); + //Debug.Log($"newTower1:{newTower1.towerName} newTower2:{newTower2.towerName}"); + + TowerPlacementGridEndless.instance.PlayPutPs(newTower2.gridPosition.x, newTower2.gridPosition.y); return true; } } @@ -1617,6 +1757,7 @@ { if (!isBuilding) return false; + //Debug.Log("开始造塔" + m_GridPosition); // 判断是否格子上重复放置塔防 if (!m_CurrentTower || !IsGhostAtValidPosition()) { @@ -1649,6 +1790,7 @@ CancelGhostPlacement(); return false; } + PlaceGhost(pointer); } return true; @@ -1678,6 +1820,7 @@ public void PlayUpgradeEffect(Tower newTower) { newTower.CurrentTowerLevel.PlayUpGradeEffect(); + AudioSourceManager.Ins.Play(AudioEnum.Upgrade); } /// <summary> @@ -1946,7 +2089,7 @@ /// <summary> /// 随机放置Tower按钮禁止使用,灰掉. /// </summary> - protected void disableRandomTowerBtn() + public void disableRandomTowerBtn() { randomTowerBtn.GetComponent<EndlessRandomTower>().ChangeBtnClick(); //randomTowerBtn.interactable = false; @@ -1961,7 +2104,7 @@ /// <summary> /// 随机购买Tower的按钮重设置为有效. /// </summary> - protected void enableRandomTowerBtn() + public void enableRandomTowerBtn() { // ATTENTION TO FIX: 再次判断是因为有的地方是直接调用 if ((TowerPrice.instance.currentTowerPrice > EndlessLevelManager.instance.Currency.currentCurrency) || @@ -2009,16 +2152,57 @@ if (tm) { tm.GetComponent<Transform>().SetParent(GameObject.Find("MainUI/TextPanel").GetComponent<Transform>(), true); - string bloodStr = ""; - if (doubleHit) - bloodStr += "Dble!"; - if (crit) - bloodStr += "Crt!"; - bloodStr += "-"; + string bloodStr = "-"; bloodStr += ((Int64)val).ToString(); tm.moveBloodText(spos.x, spos.y, bloodStr, crit); } + } + + /// <summary> + /// 减速飘字 + /// </summary> + public void FloatSlowDownWord(Vector3 worldPos) + { + Vector3 screenPos = m_Camera.WorldToScreenPoint(worldPos); + GameObject obj = Instantiate(SlowDownWord.gameObject); + obj.GetComponent<Transform>().SetParent(GameObject.Find("MainUI/TextPanel").GetComponent<Transform>(), false); + obj.GetComponent<TextMoveDoTween>().FloatSlowDownWord(screenPos.x, screenPos.y); + } + + /// <summary> + /// 暴击飘字 + /// </summary> + public void FloatCritWord(Vector3 worldPos) + { + Vector3 screenPos = m_Camera.WorldToScreenPoint(worldPos); + GameObject obj = Instantiate(CritWord.gameObject); + obj.GetComponent<Transform>().SetParent(GameObject.Find("MainUI/TextPanel").GetComponent<Transform>(), false); + obj.GetComponent<TextMoveDoTween>().FloatCritWord(screenPos.x, screenPos.y); + } + + /// <summary> + /// 冰冻飘字 + /// </summary> + /// <param name="worldPos"></param> + public void FloatFrostWord(Vector3 worldPos) + { + Vector3 screenPos = m_Camera.WorldToScreenPoint(worldPos); + GameObject obj = Instantiate(FrostWord.gameObject); + obj.GetComponent<Transform>().SetParent(GameObject.Find("MainUI/TextPanel").GetComponent<Transform>(), false); + obj.GetComponent<TextMoveDoTween>().FloatFrostWord(screenPos.x, screenPos.y); + } + + /// <summary> + /// 克制飘字 + /// </summary> + /// <param name="worldPos"></param> + public void FloatRestrainWord(Vector3 worldPos) + { + Vector3 screenPos = m_Camera.WorldToScreenPoint(worldPos); + GameObject obj = Instantiate(RestrainWord.gameObject); + obj.GetComponent<Transform>().SetParent(GameObject.Find("MainUI/TextPanel").GetComponent<Transform>(), false); + obj.GetComponent<TextMoveDoTween>().FloatRestrainWord(screenPos.x, screenPos.y); } private void Start() @@ -2030,7 +2214,7 @@ m_CurrentArea = placeObj.GetComponent<IPlacementArea>(); dragTowerPlacement = placeObj.GetComponent<IPlacementArea>() as TowerPlacementGridEndless; } - placeObj = GameObject.FindGameObjectWithTag("PlaceTowerOpponent"); + //placeObj = GameObject.FindGameObjectWithTag("PlaceTowerOpponent"); EventCenter.Ins.Add((int)KTGMGemClient.EventType.EndlessHeartAllLose, AllHeartLose); } @@ -2117,7 +2301,6 @@ bool successfulPurchase = EndlessLevelManager.instance.Currency.TryPurchase(cost); if (!successfulPurchase) return false; - EndlessRandomTower.instance.UpdateDescDisplay(); SetUpGhostTower(tow); //Debug.Log("设置影子塔防."); m_CurrentTower.Show(); @@ -2190,9 +2373,12 @@ //Debug.Log("没有点中或者点中了UI:" + hasHit.ToString() + "," + uiPointer.overUI.ToString()); return; } - var controller = output.collider.GetComponent<Tower>(); + Tower controller = output.collider.GetComponent<Tower>(); if (controller != null) { + // 泡泡禁锢状态不允许拖动 + if (controller.IsStartBondage) return; + SelectTower(controller); } @@ -2200,7 +2386,21 @@ CalSelTowerScreenOffset(info, controller); } + public void OnPressed(PointerInfo info) + { + UIPointer uiPointer = WrapPointer(info); + RaycastHit output; + bool hasHit = Physics.Raycast(uiPointer.ray, out output, float.MaxValue, towerSelectionLayer); + if (uiPointer.overUI) return; + + if (hasHit) + { + Tower controller = output.collider.GetComponent<Tower>(); + if (controller != null) + controller.OnPressed(); + } + } /// <summary> /// 鼠标选中一个Tower的时候,计算当前鼠标位置与当前Tower位置在屏幕上坐标位置的偏移量。 @@ -2395,6 +2595,9 @@ } else { + MoveGhostOntoWorld(npt.ray, hideWhenInvalid); + + return; // 根据技能塔的类型,来碰撞不同的数据: // 火是列攻击: if (m_CurrentTower.controller.towerFeature == EFeatureTower.Skill_Fire) @@ -2432,7 +2635,6 @@ m_CurrentTower.fadeOutAttackArea(); } - MoveGhostOntoWorld(npt.ray, hideWhenInvalid); } } @@ -2450,6 +2652,7 @@ return; } m_GridPosition = m_CurrentArea.WorldToGrid(raycast.point, m_CurrentTower.controller.dimensions); + //Debug.Log("修改了m_GridPosition:" + m_GridPosition); TowerFitStatus fits = m_CurrentArea.Fits(m_GridPosition, m_CurrentTower.controller.dimensions); m_CurrentTower.Show(); @@ -2471,8 +2674,9 @@ { RaycastHit hit; + Physics.Raycast(ray, out hit, float.MaxValue); // check against all layers that the ghost can be on - Physics.SphereCast(ray, sphereCastRadius, out hit, float.MaxValue, ghostWorldPlacementMask); + //Physics.SphereCast(ray, sphereCastRadius, out hit, float.MaxValue, ghostWorldPlacementMask); if (hit.collider == null) { return; @@ -2499,10 +2703,12 @@ /// <exception cref="InvalidOperationException">If we're not in the correct state</exception> protected void PlaceGhost(UIPointer pointer) { - MoveGhost(pointer); + //MoveGhost(pointer); if (m_CurrentArea != null) { + //Debug.Log("开始检测PlaceGhost:" + m_GridPosition); + TowerFitStatus fits = m_CurrentArea.Fits(m_GridPosition, m_CurrentTower.controller.dimensions); if (fits == TowerFitStatus.Fits) -- Gitblit v1.9.1