From 56f231f1f6523d7920cf32f033f9bb6f0015550f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 28 Oct 2020 18:05:11 +0800
Subject: [PATCH] Merge commit '8380b3c000a04bd9bf6dfc11fd8337c1563ad265' into master
---
Assets/Prefabs/Towers/SkillFire/SkillFireTower_1.prefab | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Assets/Prefabs/Towers/SkillFire/SkillFireTower_1.prefab b/Assets/Prefabs/Towers/SkillFire/SkillFireTower_1.prefab
index d12b97c..ab2379d 100644
--- a/Assets/Prefabs/Towers/SkillFire/SkillFireTower_1.prefab
+++ b/Assets/Prefabs/Towers/SkillFire/SkillFireTower_1.prefab
@@ -14617,7 +14617,9 @@
m_EditorClassIdentifier:
towerGhostPrefab: {fileID: 114795132175009648, guid: 3880a3c8d64858e488e20c5a2ab4ff16,
type: 3}
- buildEffectPrefab: {fileID: 1395313577031670, guid: c559c1920b5d04e6d83aa4464fba5c68,
+ buildEffectPrefab: {fileID: 7075300226719811381, guid: a3ffad0742f1416499458b12a1b8187c,
+ type: 3}
+ UpgradeEffectPrefab: {fileID: 3681181936307124407, guid: 4f841d500cb4a9c4a99872c566e45c63,
type: 3}
levelDamager: {fileID: 114588164740221456, guid: a55cb9a6479d95347866a39cd0aede6e,
type: 3}
@@ -29098,8 +29100,7 @@
m_Script: {fileID: 11500000, guid: de49640db9f74ca892b78c0d6bb4eb02, type: 3}
m_Name:
m_EditorClassIdentifier:
- fireParticleSystem: {fileID: 2318591686727675674, guid: b52e9414c9dda40438d3d2662dd775d3,
- type: 3}
+ fireParticleObj: {fileID: 0}
fireParticleSystem1: {fileID: 6646496428540295224}
fireParticleSystem2: {fileID: 0}
--- !u!114 &114569419341490114
--
Gitblit v1.9.1