From cdadbc5ac879339934eb03644b802cb6b252794d Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 26 Nov 2020 19:07:17 +0800
Subject: [PATCH] 修改蓄力特效 查看buff 会不出怪的bug
---
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs | 3
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs | 15 -
Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab | 100 +++++++++
Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab | 100 +++++++++
Assets/Scripts/TowerDefense/Level/EndlessWave.cs | 5
Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab | 112 ++++++++++
Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_XuLi.prefab | 8
Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab | 100 +++++++++
Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab | 100 +++++++++
And/GemBattle.apk | 0
Assets/Prefabs/UI/Endless/BottomCanvas.prefab | 4
11 files changed, 510 insertions(+), 37 deletions(-)
diff --git a/And/GemBattle.apk b/And/GemBattle.apk
index 22c184e..8c23872 100644
--- a/And/GemBattle.apk
+++ b/And/GemBattle.apk
Binary files differ
diff --git a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_XuLi.prefab b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_XuLi.prefab
index fd415a7..bddc855 100644
--- a/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_XuLi.prefab
+++ b/Assets/00000/package/Prefab/Prefab/Effect_Elf_Mu_XuLi.prefab
@@ -48,7 +48,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 1
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 1
useRigidbodyForVelocity: 1
@@ -4921,7 +4921,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 1
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 1
useRigidbodyForVelocity: 1
@@ -9737,7 +9737,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 1
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 1
useRigidbodyForVelocity: 1
@@ -14647,7 +14647,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 1
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 1
useRigidbodyForVelocity: 1
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab
index c1775a1..77e1e47 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_0.prefab
@@ -43418,8 +43418,7 @@
towerTargetter: {fileID: 114079108543431824}
radiusEffectColor: {r: 0, g: 1, b: 1, a: 0.09803922}
towerLevel: {fileID: 114779466188146336}
- WoodChargeEffect: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
- type: 3}
+ WoodChargeEffect: {fileID: 1343136777780208213}
WoodChargeTransform: {fileID: 4457715277627928}
--- !u!1 &1860257489135870
GameObject:
@@ -43682,6 +43681,7 @@
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_Children:
- {fileID: 4457715277627928}
+ - {fileID: 4355713470483064418}
m_Father: {fileID: 8585450897344132209}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -43896,6 +43896,102 @@
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1001 &2006543999382025527
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 5188825432757432286}
+ m_Modifications:
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.431
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1.953
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_Elf_Mu_XuLi
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 84898241366df044d8e0b34e479c559f, type: 3}
+--- !u!4 &4355713470483064418 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ m_PrefabInstance: {fileID: 2006543999382025527}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &1343136777780208213 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 683257324298655586, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ m_PrefabInstance: {fileID: 2006543999382025527}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &2910397211145414215
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab
index 0b21bbe..8219c36 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_1.prefab
@@ -29102,8 +29102,7 @@
towerTargetter: {fileID: 114831088907122518}
radiusEffectColor: {r: 0, g: 1, b: 1, a: 0.09803922}
towerLevel: {fileID: 114056922861069036}
- WoodChargeEffect: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
- type: 3}
+ WoodChargeEffect: {fileID: 1640905477764799002}
WoodChargeTransform: {fileID: 930484069627965929}
--- !u!1 &1823473106924508
GameObject:
@@ -62575,6 +62574,7 @@
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_Children:
- {fileID: 930484069627965929}
+ - {fileID: 4041126671648366125}
m_Father: {fileID: 5810279278144834844}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -86911,6 +86911,102 @@
m_EditorClassIdentifier:
defaultParticles: {fileID: 3934684314456750409}
mobileParticles: {fileID: 4244977394116926366}
+--- !u!1001 &2287477024835014008
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 3096120295970705482}
+ m_Modifications:
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.431
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1.953
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_Elf_Mu_XuLi
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 84898241366df044d8e0b34e479c559f, type: 3}
+--- !u!4 &4041126671648366125 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ m_PrefabInstance: {fileID: 2287477024835014008}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &1640905477764799002 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 683257324298655586, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ m_PrefabInstance: {fileID: 2287477024835014008}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &3689896968225577715
PrefabInstance:
m_ObjectHideFlags: 0
@@ -87075,15 +87171,15 @@
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2ff5adb841c4a2c47bdf1b1bf72e6b17, type: 3}
---- !u!4 &8099991190947636266 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 148945322413984678, guid: 2ff5adb841c4a2c47bdf1b1bf72e6b17,
- type: 3}
- m_PrefabInstance: {fileID: 8248865989992329100}
- m_PrefabAsset: {fileID: 0}
--- !u!23 &898841339156093036 stripped
MeshRenderer:
m_CorrespondingSourceObject: {fileID: 9079406959305619424, guid: 2ff5adb841c4a2c47bdf1b1bf72e6b17,
type: 3}
m_PrefabInstance: {fileID: 8248865989992329100}
m_PrefabAsset: {fileID: 0}
+--- !u!4 &8099991190947636266 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 148945322413984678, guid: 2ff5adb841c4a2c47bdf1b1bf72e6b17,
+ type: 3}
+ m_PrefabInstance: {fileID: 8248865989992329100}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab
index 37c7779..3f34d47 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_2.prefab
@@ -28925,8 +28925,7 @@
towerTargetter: {fileID: 114624795727799840}
radiusEffectColor: {r: 0, g: 1, b: 1, a: 0.09803922}
towerLevel: {fileID: 114683032773000130}
- WoodChargeEffect: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
- type: 3}
+ WoodChargeEffect: {fileID: 439729181618263074}
WoodChargeTransform: {fileID: 4726805076667173648}
--- !u!1 &1800239179868154
GameObject:
@@ -72511,6 +72510,7 @@
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_Children:
- {fileID: 4726805076667173648}
+ - {fileID: 2939556186546376725}
m_Father: {fileID: 3569833485428815143}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -129926,6 +129926,102 @@
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
+--- !u!1001 &1108256829642343232
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 9113208705347687183}
+ m_Modifications:
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.431
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1.953
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_Elf_Mu_XuLi
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 84898241366df044d8e0b34e479c559f, type: 3}
+--- !u!4 &2939556186546376725 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ m_PrefabInstance: {fileID: 1108256829642343232}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &439729181618263074 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 683257324298655586, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ m_PrefabInstance: {fileID: 1108256829642343232}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1935603015723209277
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab
index 83ed649..55ea372 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_3.prefab
@@ -28925,8 +28925,7 @@
towerTargetter: {fileID: 114624795727799840}
radiusEffectColor: {r: 0, g: 1, b: 1, a: 0.09803922}
towerLevel: {fileID: 114683032773000130}
- WoodChargeEffect: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
- type: 3}
+ WoodChargeEffect: {fileID: 3747453553966714973}
WoodChargeTransform: {fileID: 7208623104397428330}
--- !u!1 &1800239179868154
GameObject:
@@ -72399,6 +72398,7 @@
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_Children:
- {fileID: 7208623104397428330}
+ - {fileID: 1932322131298407530}
m_Father: {fileID: 7818231093510522508}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -130117,3 +130117,99 @@
type: 3}
m_PrefabInstance: {fileID: 2615788393766936060}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4430077267241551679
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 2520702670150417781}
+ m_Modifications:
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.431
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1.953
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_Elf_Mu_XuLi
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 84898241366df044d8e0b34e479c559f, type: 3}
+--- !u!4 &1932322131298407530 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ m_PrefabInstance: {fileID: 4430077267241551679}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &3747453553966714973 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 683257324298655586, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ m_PrefabInstance: {fileID: 4430077267241551679}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab b/Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab
index 95243c6..b5f1553 100644
--- a/Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/BlinkTower_4.prefab
@@ -28925,8 +28925,7 @@
towerTargetter: {fileID: 114624795727799840}
radiusEffectColor: {r: 0, g: 1, b: 1, a: 0.09803922}
towerLevel: {fileID: 114683032773000130}
- WoodChargeEffect: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
- type: 3}
+ WoodChargeEffect: {fileID: 5243034931142158396}
WoodChargeTransform: {fileID: 3053498307503446518}
--- !u!1 &1800239179868154
GameObject:
@@ -105826,6 +105825,7 @@
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_Children:
- {fileID: 3053498307503446518}
+ - {fileID: 7355044388913654795}
m_Father: {fileID: 7843804599158117456}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -130102,3 +130102,99 @@
type: 3}
m_PrefabInstance: {fileID: 3676670639218707797}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4735652205735984990
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 8297949238132562449}
+ m_Modifications:
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.431
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1.953
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 7969863196304925275, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_Elf_Mu_XuLi
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 84898241366df044d8e0b34e479c559f, type: 3}
+--- !u!4 &7355044388913654795 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2858157867743941461, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ m_PrefabInstance: {fileID: 4735652205735984990}
+ m_PrefabAsset: {fileID: 0}
+--- !u!198 &5243034931142158396 stripped
+ParticleSystem:
+ m_CorrespondingSourceObject: {fileID: 683257324298655586, guid: 84898241366df044d8e0b34e479c559f,
+ type: 3}
+ m_PrefabInstance: {fileID: 4735652205735984990}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
index 31b086d..d2485f6 100644
--- a/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
+++ b/Assets/Prefabs/UI/Endless/BottomCanvas.prefab
@@ -7238,12 +7238,12 @@
- target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 455
+ value: -446
objectReference: {fileID: 0}
- target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 521
+ value: 436
objectReference: {fileID: 0}
- target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
type: 3}
diff --git a/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs b/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
index 1c51b09..e4f275f 100644
--- a/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
+++ b/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
@@ -161,9 +161,7 @@
/// <summary>
/// 木属性精灵蓄力特效
/// </summary>
- public GameObject WoodChargeEffect;
-
- private GameObject woodChargeEffect;
+ public ParticleSystem WoodChargeEffect;
public Transform WoodChargeTransform;
@@ -344,12 +342,11 @@
woodChargeEffectTime -= Time.deltaTime;
UpdateWoodAim();
- if (woodChargeEffectTime <= 0 && woodChargeEffect != null)
+ if (woodChargeEffectTime <= 0)
{
towerPtr.IsWoodCharge = false;
CancelWoodAim();
- Destroy(woodChargeEffect);
- woodChargeEffect = null;
+ WoodChargeEffect.Stop();
}
}
@@ -707,11 +704,7 @@
woodRemainChargeTime = decreaseWoodChargeTime.GetWoodChargeTime(woodChargeTime);
woodChargeEffectTime = woodRemainChargeTime + 0.5f / towerLevel.ActionAnimator.speed;
- woodChargeEffect = Instantiate(WoodChargeEffect);
- woodChargeEffect.transform.SetParent(gameObject.transform);
- woodChargeEffect.transform.SetPositionAndRotation(WoodChargeTransform.position, WoodChargeTransform.rotation);
- ParticleSystem ps = woodChargeEffect.transform.GetChild(0).GetComponent<ParticleSystem>();
- ps.Play();
+ WoodChargeEffect.Play();
}
}
else
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWave.cs b/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
index 19d9f1b..c563b5d 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
@@ -117,10 +117,11 @@
public void RestartWave()
{
- StartTimer(spawnTimer);
+ if (spawnTimer != null)
+ StartTimer(spawnTimer);
isWavePaused = false;
- if (spawnedEnemies == 0)
+ if (spawnedEnemies == 0 && waveData != null)
SpawnCurrent();
}
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
index a2b3a60..9fe4d07 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
@@ -430,8 +430,7 @@
{
foreach (EndlessPortConfig data in waveData)
{
- if (waves[data.Config.tunel - 1].LineState == EndlessWaveLineState.Spawning)
- waves[data.Config.tunel - 1].RestartWave();
+ waves[data.Config.tunel - 1].RestartWave();
}
}
--
Gitblit v1.9.1