From 028a6c50ac23a694edbf1d3f604f58a66346417f Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Wed, 18 Nov 2020 11:27:38 +0800
Subject: [PATCH] 修改攻击范围的渲染层级 BottomUI不再使用1080*1920，而是直接适配 离开技能区域关闭提示
---
Assets/00000/package/Prefab/Prefab/Effect_UI_GongJiFanWei.prefab | 2
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs | 8 ++++
Assets/Prefabs/UI/Endless/BottomCanvas.prefab | 10 ++--
Assets/Scenes/Levels/Battle/Endless2D.unity | 49 ++++++++++++++++++------
4 files changed, 51 insertions(+), 18 deletions(-)
diff --git a/Assets/00000/package/Prefab/Prefab/Effect_UI_GongJiFanWei.prefab b/Assets/00000/package/Prefab/Prefab/Effect_UI_GongJiFanWei.prefab
index 44b254a..7f25d12 100644
--- a/Assets/00000/package/Prefab/Prefab/Effect_UI_GongJiFanWei.prefab
+++ b/Assets/00000/package/Prefab/Prefab/Effect_UI_GongJiFanWei.prefab
@@ -9688,7 +9688,7 @@
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 0
+ m_SortingOrder: 1
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
diff --git a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
index be1e9af..4152ea1 100644
--- a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
+++ b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
@@ -59,7 +59,7 @@
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -268,7 +268,7 @@
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -5529,10 +5529,10 @@
m_Father: {fileID: 4623057512704841790}
m_RootOrder: 0
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_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 1080, y: 1920}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &605952583426336762
PrefabInstance:
diff --git a/Assets/Scenes/Levels/Battle/Endless2D.unity b/Assets/Scenes/Levels/Battle/Endless2D.unity
index 16163c0..5658a65 100644
--- a/Assets/Scenes/Levels/Battle/Endless2D.unity
+++ b/Assets/Scenes/Levels/Battle/Endless2D.unity
@@ -4072,15 +4072,45 @@
m_Modification:
m_TransformParent: {fileID: 1340671931}
m_Modifications:
+ - target: {fileID: 4623057511285327670, guid: 29da21b318f42054db30c52123aa4dbf,
+ type: 3}
+ propertyPath: m_margin.w
+ value: -2.4372947
+ objectReference: {fileID: 0}
+ - target: {fileID: 4623057511285327670, guid: 29da21b318f42054db30c52123aa4dbf,
+ type: 3}
+ propertyPath: m_margin.y
+ value: 7.656536
+ objectReference: {fileID: 0}
+ - target: {fileID: 4623057511285327670, guid: 29da21b318f42054db30c52123aa4dbf,
+ type: 3}
+ propertyPath: m_margin.z
+ value: 3.4907608
+ objectReference: {fileID: 0}
+ - target: {fileID: 4623057511285327671, guid: 29da21b318f42054db30c52123aa4dbf,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 133.9
+ objectReference: {fileID: 0}
+ - target: {fileID: 4623057511285327671, guid: 29da21b318f42054db30c52123aa4dbf,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 118.541504
+ objectReference: {fileID: 0}
+ - target: {fileID: 4623057511285327671, guid: 29da21b318f42054db30c52123aa4dbf,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4623057511285327671, guid: 29da21b318f42054db30c52123aa4dbf,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 20.4
+ objectReference: {fileID: 0}
- target: {fileID: 4623057512524248738, guid: 29da21b318f42054db30c52123aa4dbf,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -0.0007324219
- objectReference: {fileID: 0}
- - target: {fileID: 4623057512702542564, guid: 29da21b318f42054db30c52123aa4dbf,
- type: 3}
- propertyPath: m_IsActive
- value: 0
+ value: -0.000061035156
objectReference: {fileID: 0}
- target: {fileID: 4623057512704841786, guid: 29da21b318f42054db30c52123aa4dbf,
type: 3}
@@ -4197,11 +4227,6 @@
propertyPath: m_Camera
value:
objectReference: {fileID: 1340671930}
- - target: {fileID: 4623057513073301098, guid: 29da21b318f42054db30c52123aa4dbf,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 250.33997
- objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 29da21b318f42054db30c52123aa4dbf, type: 3}
--- !u!1 &898016331
@@ -5948,7 +5973,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1308461724}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.9, z: 9.5}
+ m_LocalPosition: {x: 0, y: 0.1, z: 9.5}
m_LocalScale: {x: 5.08, y: 1, z: 3.857}
m_Children: []
m_Father: {fileID: 304173789}
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
index 2023709..b8892ca 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
@@ -2301,6 +2301,14 @@
}
//selEff.SetWaveLineSel(true);
}
+ else
+ {
+ if (currentEffect != null)
+ {
+ currentEffect.SetParticleSystem(false);
+ currentEffect = null;
+ }
+ }
}
// 炸弹是区域攻击显示:
else if (m_CurrentTower.controller.towerFeature == EFeatureTower.Skill_Bomb)
--
Gitblit v1.9.1