From 837df9935ebd81ca8f16bd5aa2a1c4e0bfd26c88 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Mon, 23 Nov 2020 15:42:07 +0800
Subject: [PATCH] 修改BOSS位置，添加死亡特效
---
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 6 +
Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs | 11 +
Assets/Prefabs/UI/Endless/BottomCanvas.prefab | 342 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
3 files changed, 333 insertions(+), 26 deletions(-)
diff --git a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
index e362531..8da8c26 100644
--- a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
+++ b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
@@ -1891,7 +1891,7 @@
- {fileID: 2593358111013876827}
- {fileID: 2593358110207618567}
hpTxt: {fileID: 1142406570228246042}
- ps: {fileID: 3069635936539494428}
+ ps: {fileID: 0}
--- !u!1 &4623057511712181235
GameObject:
m_ObjectHideFlags: 0
@@ -5137,7 +5137,9 @@
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
- m_Children: []
+ m_Children:
+ - {fileID: 6939871581735716122}
+ - {fileID: 1943973236042931000}
m_Father: {fileID: 2459412157512953547}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5217,6 +5219,8 @@
m_EditorClassIdentifier:
BossAnimator: {fileID: 4623057513214273137}
Title: {fileID: 4623057512301994787}
+ deadPS: {fileID: 1943973235480785952}
+ deadMoney: {fileID: 6939871581287140816}
--- !u!114 &4623057513214273141
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -6126,12 +6130,6 @@
type: 3}
m_PrefabInstance: {fileID: 401030652621062211}
m_PrefabAsset: {fileID: 0}
---- !u!198 &3069635936539494428 stripped
-ParticleSystem:
- m_CorrespondingSourceObject: {fileID: 3389300522131408991, guid: 296dddd14ba103e4aa483333fe748c6f,
- type: 3}
- m_PrefabInstance: {fileID: 401030652621062211}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &605952583426336762
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6221,6 +6219,137 @@
m_CorrespondingSourceObject: {fileID: 5770368434774733121, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
type: 3}
m_PrefabInstance: {fileID: 605952583426336762}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2587555311145952839
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 4623057513214273150}
+ m_Modifications:
+ - target: {fileID: 4875067121180857496, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121180857501, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121227623316, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121227623319, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315548, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_Boss_JinBi
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315548, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 34
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 160
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067122333415371, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4875067122333415382, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: d418c7d26c1cbd44da475050ec3e9f09, type: 3}
+--- !u!198 &6939871581287140816 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 4875067121227623319, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ m_PrefabInstance: {fileID: 2587555311145952839}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &6939871581735716122 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 4875067121843315549, guid: d418c7d26c1cbd44da475050ec3e9f09,
+ type: 3}
+ m_PrefabInstance: {fileID: 2587555311145952839}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2593358110680681470
PrefabInstance:
@@ -6381,15 +6510,15 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3}
---- !u!224 &4623057511292283298 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
- type: 3}
- m_PrefabInstance: {fileID: 2593358110680681470}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &4623057511292283299 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 2593358110680681470}
+ m_PrefabAsset: {fileID: 0}
+--- !u!224 &4623057511292283298 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
type: 3}
m_PrefabInstance: {fileID: 2593358110680681470}
m_PrefabAsset: {fileID: 0}
@@ -7037,6 +7166,12 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: edd0f54808263644d9740a9c0040b493, type: 3}
+--- !u!1 &8424158400893339871 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3801312133014535296, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ m_PrefabInstance: {fileID: 4623057511554511967}
+ m_PrefabAsset: {fileID: 0}
--- !u!114 &1184553460454064981 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5789385329819219722, guid: edd0f54808263644d9740a9c0040b493,
@@ -7052,12 +7187,6 @@
--- !u!224 &6989462182969459993 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
- type: 3}
- m_PrefabInstance: {fileID: 4623057511554511967}
- m_PrefabAsset: {fileID: 0}
---- !u!1 &8424158400893339871 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 3801312133014535296, guid: edd0f54808263644d9740a9c0040b493,
type: 3}
m_PrefabInstance: {fileID: 4623057511554511967}
m_PrefabAsset: {fileID: 0}
@@ -7381,12 +7510,6 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 49213eb9f84d76e47b6b19e9a246b83c, type: 3}
---- !u!224 &3028643155083363564 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 7651475816072793687, guid: 49213eb9f84d76e47b6b19e9a246b83c,
- type: 3}
- m_PrefabInstance: {fileID: 4623057511726664379}
- m_PrefabAsset: {fileID: 0}
--- !u!114 &7735723185037147486 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3130750578608519141, guid: 49213eb9f84d76e47b6b19e9a246b83c,
@@ -7399,6 +7522,12 @@
m_Script: {fileID: 11500000, guid: 9a92c216c3d4e97459299f45fc451060, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!224 &3028643155083363564 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7651475816072793687, guid: 49213eb9f84d76e47b6b19e9a246b83c,
+ type: 3}
+ m_PrefabInstance: {fileID: 4623057511726664379}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &4623057511748623860
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8023,3 +8152,164 @@
type: 3}
m_PrefabInstance: {fileID: 4785657875164342461}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8838515693527675699
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 4623057513214273150}
+ m_Modifications:
+ - target: {fileID: 6940845726533495753, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726533495754, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726834471751, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726834471754, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463112, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_Boss_Shui_SiWang
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463112, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 34
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 160
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 12
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845727152790737, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845727152790738, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845727800723234, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845727800723263, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845728269088371, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845728269088374, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845728497157907, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6940845728497157910, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: e7d3a92aa8864b848b46a5ab0983fb5b, type: 3}
+--- !u!4 &1943973236042931000 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6940845726844463115, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ m_PrefabInstance: {fileID: 8838515693527675699}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &1943973235480785952 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 6940845728497157907, guid: e7d3a92aa8864b848b46a5ab0983fb5b,
+ type: 3}
+ m_PrefabInstance: {fileID: 8838515693527675699}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs b/Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs
index 792ca26..d43990c 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs
@@ -28,6 +28,8 @@
private string titlePath = "UI/Endless/SkillTitle/";
+ public ParticleSystem deadPS, deadMoney;
+
// Start is called before the first frame update
private void Start()
{
@@ -101,7 +103,16 @@
if (newState == EndlessBossActionState.Standing || newState == EndlessBossActionState.Summon)
BossAnimator.speed = 1;
+ else if (newState == EndlessBossActionState.Death)
+ {
+ //Debug.Log("BOSS死亡特效");
+ //播放特效
+ deadPS.Play();
+ deadMoney.Play();
+ }
BossAnimator.SetInteger("State", (int)newState);
+
+
}
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index d171304..5a88bb1 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -80,6 +80,12 @@
transform.Find("Panel/Bottom").GetComponent<RectTransform>().anchoredPosition += tmpOffect;
transform.Find("Panel/TowerBuyBtn").GetComponent<RectTransform>().anchoredPosition += tmpOffect;
+ transform.Find("Panel/BossHPBar").GetComponent<RectTransform>().anchoredPosition -= tmpOffect*0.5f;
+ transform.Find("Panel/Score").GetComponent<RectTransform>().anchoredPosition -= tmpOffect*0.5f;
+ transform.Find("Panel/TimeInfo").GetComponent<RectTransform>().anchoredPosition -= tmpOffect*0.5f;
+ //transform.Find("Panel/Boss").GetComponent<RectTransform>().anchoredPosition -= tmpOffect*0.5f;
+
+
//darkGroundImg = transform.Find("Image_DarkGround").gameObject;
darkGroundImg.GetComponent<RectTransform>().offsetMin += tmpOffect;
darkGroundImg.GetComponent<RectTransform>().offsetMax -= tmpOffect*0.5f;
--
Gitblit v1.9.1