From 85f0d13945f3aef5aef1b3c1b47c77cea0514c17 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 22 Oct 2020 16:06:50 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Prefabs/Towers/Fire/FireProjectile_4.prefab | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Assets/Prefabs/Towers/Fire/FireProjectile_4.prefab b/Assets/Prefabs/Towers/Fire/FireProjectile_4.prefab
index fddc978..f172427 100644
--- a/Assets/Prefabs/Towers/Fire/FireProjectile_4.prefab
+++ b/Assets/Prefabs/Towers/Fire/FireProjectile_4.prefab
@@ -10,7 +10,7 @@
m_Component:
- component: {fileID: 4175724221962164}
- component: {fileID: 96660694867418570}
- m_Layer: 0
+ m_Layer: 17
m_Name: Trail
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -148,7 +148,7 @@
m_Component:
- component: {fileID: 4808590832096036}
- component: {fileID: 96333004746772180}
- m_Layer: 0
+ m_Layer: 17
m_Name: TrailAB
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -278,7 +278,7 @@
- component: {fileID: 4572622955309552}
- component: {fileID: 198765345971197024}
- component: {fileID: 199285294356792230}
- m_Layer: 0
+ m_Layer: 17
m_Name: Particles
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -5090,7 +5090,7 @@
- component: {fileID: 4828398092512172}
- component: {fileID: 198322058363593520}
- component: {fileID: 199618226897204626}
- m_Layer: 0
+ m_Layer: 17
m_Name: Swirl
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -9969,7 +9969,7 @@
- component: {fileID: 4312408608713502}
- component: {fileID: 198310119662004396}
- component: {fileID: 199085450165201728}
- m_Layer: 0
+ m_Layer: 17
m_Name: DarkerTones
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -14857,7 +14857,7 @@
- component: {fileID: 8096622218408451418}
- component: {fileID: 6439777814496425052}
- component: {fileID: 8939101576036790455}
- m_Layer: 0
+ m_Layer: 17
m_Name: FireProjectile_4
m_TagString: Projectile
m_Icon: {fileID: 0}
--
Gitblit v1.9.1