From b3597e5148e64a08abe5730396c4018ccfa76e22 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 26 Nov 2020 16:26:11 +0800
Subject: [PATCH] buff预览界面打开时停止出怪
---
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs | 2
Assets/Scripts/TowerDefense/Level/EndlessWave.cs | 24 +++-
Assets/Materials/Guide/RectGuidance.mat | 6
Assets/UI/Endless/BackBtn.png | 0
Assets/Resources/UI/BuffPreview/BuffItem.prefab | 9 +
Assets/Prefabs/UI/Endless/BottomCanvas.prefab | 65 ++++++++++++
Assets/Scenes/Levels/Battle/Endless2D.unity | 4
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs | 3
Assets/Scripts/TowerDefense/Towers/Tower.cs | 5 +
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs | 2
Assets/Scripts/TowerDefense/UI/EndlessBuffPreview.cs | 2
Assets/Materials/UI/tileTowerVSMat.mat | 2
Assets/UI/Endless/BackBtn.png.meta | 118 +++++++++++++++++++++++
13 files changed, 221 insertions(+), 21 deletions(-)
diff --git a/Assets/Materials/Guide/RectGuidance.mat b/Assets/Materials/Guide/RectGuidance.mat
index dfce088..76a9248 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
- - _SliderY: 80
+ - _SliderX: 79
+ - _SliderY: 79
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
@@ -83,7 +83,7 @@
- _UseUIAlphaClip: 0
- _ZWrite: 1
m_Colors:
- - _Center: {r: 6, g: -124, b: 0, a: 0}
+ - _Center: {r: 459, g: 280, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Materials/UI/tileTowerVSMat.mat b/Assets/Materials/UI/tileTowerVSMat.mat
index 48d981d..29c24ee 100644
--- a/Assets/Materials/UI/tileTowerVSMat.mat
+++ b/Assets/Materials/UI/tileTowerVSMat.mat
@@ -40,7 +40,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 8c9a3d26120e78f40aa4ef9ed23d573c, type: 3}
+ m_Texture: {fileID: 2800000, guid: 93f40a01d57fbff418fc0b54b6ab7d9f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
diff --git a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
index 3a8834c..062272a 100644
--- a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
+++ b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
@@ -5680,7 +5680,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 10, y: -15.8}
+ m_AnchoredPosition: {x: 10, y: -15.799999}
m_SizeDelta: {x: 38, y: 38}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3183444113040340703
@@ -8817,7 +8817,7 @@
- target: {fileID: 213361600952831501, guid: 64f56bea91238bd428c595869a4070ad,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 4657746055211589680, guid: 64f56bea91238bd428c595869a4070ad,
type: 3}
@@ -8924,6 +8924,67 @@
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
+ - target: {fileID: 7519892320045013659, guid: 64f56bea91238bd428c595869a4070ad,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 330
+ objectReference: {fileID: 0}
+ - target: {fileID: 7519892320045013659, guid: 64f56bea91238bd428c595869a4070ad,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 140
+ objectReference: {fileID: 0}
+ - target: {fileID: 7519892320045013661, guid: 64f56bea91238bd428c595869a4070ad,
+ type: 3}
+ propertyPath: m_Sprite
+ value:
+ objectReference: {fileID: 21300000, guid: 1399e2c6363cc2c4f836eb151e8ccff3,
+ type: 3}
+ - target: {fileID: 7519892320045013661, guid: 64f56bea91238bd428c595869a4070ad,
+ type: 3}
+ propertyPath: m_Type
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7519892320048339638, guid: 64f56bea91238bd428c595869a4070ad,
+ type: 3}
+ propertyPath: m_Text
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 7519892320377383911, guid: 64f56bea91238bd428c595869a4070ad,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7519892320377383911, guid: 64f56bea91238bd428c595869a4070ad,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7519892320377383911, guid: 64f56bea91238bd428c595869a4070ad,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7519892320377383913, guid: 64f56bea91238bd428c595869a4070ad,
+ type: 3}
+ propertyPath: m_Padding.m_Left
+ value: 39
+ objectReference: {fileID: 0}
+ - target: {fileID: 7519892320377383913, guid: 64f56bea91238bd428c595869a4070ad,
+ type: 3}
+ propertyPath: m_Padding.m_Top
+ value: 15
+ objectReference: {fileID: 0}
+ - target: {fileID: 7519892320377383913, guid: 64f56bea91238bd428c595869a4070ad,
+ type: 3}
+ propertyPath: m_CellSize.x
+ value: 326
+ objectReference: {fileID: 0}
+ - target: {fileID: 7519892320377383913, guid: 64f56bea91238bd428c595869a4070ad,
+ type: 3}
+ propertyPath: m_CellSize.y
+ value: 496
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 64f56bea91238bd428c595869a4070ad, type: 3}
--- !u!1 &7685961245248213293 stripped
diff --git a/Assets/Resources/UI/BuffPreview/BuffItem.prefab b/Assets/Resources/UI/BuffPreview/BuffItem.prefab
index a59869c..a4ac34c 100644
--- a/Assets/Resources/UI/BuffPreview/BuffItem.prefab
+++ b/Assets/Resources/UI/BuffPreview/BuffItem.prefab
@@ -105,7 +105,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 231224318913109416}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7651475816072793687}
@@ -113,7 +113,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -0.1, y: 145.7}
+ m_AnchoredPosition: {x: -0.1, y: 144.6}
m_SizeDelta: {x: 300, y: 180}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &197385832679972540
@@ -144,7 +144,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 0574ee5edfca671449f9bffc3a1fcddd, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 4288b5b08fc1709439ab2d40d5b82539, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -195,7 +195,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -2, y: 88}
+ m_AnchoredPosition: {x: 0, y: 88}
m_SizeDelta: {x: 326, y: 496}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4196564796356168060
@@ -309,6 +309,7 @@
Name: {fileID: 7460696346899564783}
Effect: {fileID: 2087833426792226167}
Index: 0
+ myPS: {fileID: 0}
--- !u!1 &1257398673380948594
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Levels/Battle/Endless2D.unity b/Assets/Scenes/Levels/Battle/Endless2D.unity
index 6710a51..3e87d47 100644
--- a/Assets/Scenes/Levels/Battle/Endless2D.unity
+++ b/Assets/Scenes/Levels/Battle/Endless2D.unity
@@ -4080,6 +4080,10 @@
m_Modification:
m_TransformParent: {fileID: 1340671931}
m_Modifications:
+ - target: {fileID: 481883335, guid: 29da21b318f42054db30c52123aa4dbf, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 4623057512704841786, guid: 29da21b318f42054db30c52123aa4dbf,
type: 3}
propertyPath: m_Name
diff --git a/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs b/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
index 0ac6408..1c51b09 100644
--- a/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
+++ b/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
@@ -623,7 +623,7 @@
/// </summary>
protected virtual void Update()
{
- if (m_Launcher == null) return;
+ if (m_Launcher == null || towerPtr != null && !towerPtr.CanAttack) return;
// 处理当前Affector所在Tower对应的技能
updateTowerSkillData();
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWave.cs b/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
index ca35da6..19d9f1b 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
@@ -62,6 +62,11 @@
protected bool isWaveStoped = false;
/// <summary>
+ /// 暂停兵线出怪
+ /// </summary>
+ protected bool isWavePaused = false;
+
+ /// <summary>
/// 怪物刷新速度的缩放.
/// </summary>
protected float spawnTimeScale = 1.0f;
@@ -86,9 +91,13 @@
isWaveStoped = false;
spawnedEnemies = 0;
- SpawnCurrent();
spawnTimer = new RepeatingTimer(data.Config.interval / 1000f, SpawnCurrent);
- StartTimer(spawnTimer);
+
+ if (!isWavePaused)
+ {
+ SpawnCurrent();
+ StartTimer(spawnTimer);
+ }
}
/// <summary>
@@ -98,25 +107,26 @@
{
StopTimer(spawnTimer);
isWaveStoped = true;
-
- //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.WaveLineFinish,WaveLineId);
}
public void PauseWave()
{
PauseTimer(spawnTimer);
- isWaveStoped = true;
+ isWavePaused = true;
}
public void RestartWave()
{
StartTimer(spawnTimer);
- isWaveStoped = false;
+ isWavePaused = false;
+
+ if (spawnedEnemies == 0)
+ SpawnCurrent();
}
protected virtual void SpawnCurrent()
{
- if (isWaveStoped) return;
+ if (isWaveStoped || isWavePaused) return;
if (!TrySetupNextSpawn())
{
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
index f82e02f..a2b3a60 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
@@ -419,8 +419,7 @@
{
foreach (EndlessPortConfig data in waveData)
{
- if (waves[data.Config.tunel - 1].LineState == EndlessWaveLineState.Spawning)
- waves[data.Config.tunel - 1].PauseWave();
+ waves[data.Config.tunel - 1].PauseWave();
}
}
diff --git a/Assets/Scripts/TowerDefense/Towers/Tower.cs b/Assets/Scripts/TowerDefense/Towers/Tower.cs
index f376209..aafe3fd 100644
--- a/Assets/Scripts/TowerDefense/Towers/Tower.cs
+++ b/Assets/Scripts/TowerDefense/Towers/Tower.cs
@@ -166,6 +166,11 @@
get { return currentLevel == levels.Length - 1; }
}
+ /// <summary>
+ /// 是否可以攻击
+ /// </summary>
+ public bool CanAttack = true;
+
public void setTowerState(bool attack)
{
if (!materialTowerAttackSelf) return;
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBuffPreview.cs b/Assets/Scripts/TowerDefense/UI/EndlessBuffPreview.cs
index 3c64453..7abfc75 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessBuffPreview.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBuffPreview.cs
@@ -40,6 +40,8 @@
public void OnClick()
{
+ if (GameConfig.IsNewbie) return;
+
ShowBuffPreview();
}
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
index 4e049b1..9a025aa 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
@@ -351,7 +351,7 @@
{
foreach (Tower tower in m_listTower)
{
- tower.bInAttackMode = canAttack;
+ tower.CanAttack = canAttack;
}
}
diff --git a/Assets/UI/Endless/BackBtn.png b/Assets/UI/Endless/BackBtn.png
new file mode 100644
index 0000000..c37606e
--- /dev/null
+++ b/Assets/UI/Endless/BackBtn.png
Binary files differ
diff --git a/Assets/UI/Endless/BackBtn.png.meta b/Assets/UI/Endless/BackBtn.png.meta
new file mode 100644
index 0000000..2ff0471
--- /dev/null
+++ b/Assets/UI/Endless/BackBtn.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 1399e2c6363cc2c4f836eb151e8ccff3
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
--
Gitblit v1.9.1