From 8d10b61b215a3fad7eb53a7e7ee4dc9e9987d262 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Tue, 27 Oct 2020 10:18:22 +0800
Subject: [PATCH] 无尽模式改为只攻击自己对应的兵线
---
Assets/Materials/Guide/RectGuidance.mat | 4 ++--
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 2 +-
Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs | 8 +-------
Assets/Scripts/TowerDefense/Level/AgentInsManager.cs | 20 +++++++++++++++-----
Assets/Scenes/Levels/Battle/Endless.unity | 12 ++++++------
5 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/Assets/Materials/Guide/RectGuidance.mat b/Assets/Materials/Guide/RectGuidance.mat
index aad1323..d199ae7 100644
--- a/Assets/Materials/Guide/RectGuidance.mat
+++ b/Assets/Materials/Guide/RectGuidance.mat
@@ -69,8 +69,8 @@
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Slider: 81.39478
- - _SliderX: 75.0423
- - _SliderY: 0.045161847
+ - _SliderX: 75.042274
+ - _SliderY: 0.045135666
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
diff --git a/Assets/Scenes/Levels/Battle/Endless.unity b/Assets/Scenes/Levels/Battle/Endless.unity
index a120fa2..8e8b979 100644
--- a/Assets/Scenes/Levels/Battle/Endless.unity
+++ b/Assets/Scenes/Levels/Battle/Endless.unity
@@ -4623,7 +4623,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -57, y: 131}
- m_SizeDelta: {x: 125, y: 98}
+ m_SizeDelta: {x: 160, y: 160}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &603291503
MonoBehaviour:
@@ -4645,7 +4645,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: cdd61b08353647046973c95046b431fd, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 737b8e86be9c2b747948a22b08ffc52c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -9835,7 +9835,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -57, y: 68}
- m_SizeDelta: {x: 125, y: 98}
+ m_SizeDelta: {x: 160, y: 160}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1210799406
MonoBehaviour:
@@ -9857,7 +9857,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 405815c3ad7760c4fa7f22681b011e42, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 13c38a3aa8cdfeb4ba3374de8dfe5378, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -14614,7 +14614,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -57, y: 4}
- m_SizeDelta: {x: 125, y: 98}
+ m_SizeDelta: {x: 160, y: 160}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1816194828
MonoBehaviour:
@@ -14636,7 +14636,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: e4feb74c3c18cc348bb04adee456bf10, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 4cc247f8baf250d459ae77a54e4602d2, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs b/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs
index f8c2d16..32240aa 100644
--- a/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs
@@ -10,6 +10,7 @@
using TowerDefense.UI.HUD;
using UnityEngine;
using UnityEngine.AI;
+using TowerDefense.Level;
/// <summary>
/// 基于兵线的Agent Instance管理器
@@ -283,12 +284,21 @@
// 这一行防止无限的循环下去。
if (forceGet) return ag;
- Agent agLeft = GetMinDisAgent(lineid - 1, oppo, true, noPoison);
- Agent agRight = GetMinDisAgent(lineid + 1, oppo, true, noPoison);
-
agentTmpArr[0] = ag;
- agentTmpArr[1] = agLeft;
- agentTmpArr[2] = agRight;
+
+ if (!EndlessLevelManager.instanceExists)
+ {
+ Agent agLeft = GetMinDisAgent(lineid - 1, oppo, true, noPoison);
+ Agent agRight = GetMinDisAgent(lineid + 1, oppo, true, noPoison);
+
+ agentTmpArr[1] = agLeft;
+ agentTmpArr[2] = agRight;
+ }
+ else
+ {
+ agentTmpArr[1] = null;
+ agentTmpArr[2] = null;
+ }
float minDis = 100000000f;
int idx = -1;
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs
index 1d416dd..a91a3a6 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs
@@ -115,13 +115,7 @@
{
if (pos >= waveLineList.Count || waveLineList[pos] == null) return;
- int subone = pos - 1;
- int addone = pos + 1;
-
- if (subone >= 0)
- WaveLineFlash(subone);
+ // 无尽模式改为只有一条兵线
WaveLineFlash(pos);
- if (addone < waveLineList.Count)
- WaveLineFlash(addone);
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index ba0b749..ca43164 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -67,7 +67,7 @@
int guide = PlayerPrefs.GetInt("GemBattleGuide");
GameConfig.IsNewbie = guide == 0;
- if (guide == 0)
+ if (GameConfig.IsNewbie)
{
Pause();
uiStartMssk.gameObject.SetActive(false);
--
Gitblit v1.9.1