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/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Hits/Mobile/vfx_Hit_SpellOrange_Mobile.prefab |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Hits/Mobile/vfx_Hit_SpellOrange_Mobile.prefab b/Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Hits/Mobile/vfx_Hit_SpellOrange_Mobile.prefab
index 760b036..e31ab8c 100644
--- a/Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Hits/Mobile/vfx_Hit_SpellOrange_Mobile.prefab
+++ b/Assets/GabrielAguiarProductions/Unique_Projectiles_Volume_1/Prefabs/Hits/Mobile/vfx_Hit_SpellOrange_Mobile.prefab
@@ -11,7 +11,7 @@
   - component: {fileID: 4920450559640476}
   - component: {fileID: 198185429840009626}
   - component: {fileID: 199997094896644710}
-  m_Layer: 0
+  m_Layer: 17
   m_Name: BlackMark
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4845,7 +4845,7 @@
   - component: {fileID: 4040840401226160}
   - component: {fileID: 198014546144313552}
   - component: {fileID: 199004416308130514}
-  m_Layer: 0
+  m_Layer: 17
   m_Name: Shockwave
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -9683,7 +9683,7 @@
   - component: {fileID: 4398980792838230}
   - component: {fileID: 198253740286133736}
   - component: {fileID: 199270485500751778}
-  m_Layer: 0
+  m_Layer: 17
   m_Name: Beam
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -14355,7 +14355,7 @@
   - component: {fileID: 4605063558501710}
   - component: {fileID: 198816872133729062}
   - component: {fileID: 199257385795037076}
-  m_Layer: 0
+  m_Layer: 17
   m_Name: Particles
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -19189,7 +19189,7 @@
   - component: {fileID: 4147588172362242}
   - component: {fileID: 198034949565064108}
   - component: {fileID: 199713901979674834}
-  m_Layer: 0
+  m_Layer: 17
   m_Name: Hit
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -24022,7 +24022,7 @@
   m_Component:
   - component: {fileID: 4683832640433176}
   - component: {fileID: 686688017172945236}
-  m_Layer: 0
+  m_Layer: 17
   m_Name: vfx_Hit_SpellOrange_Mobile
   m_TagString: Untagged
   m_Icon: {fileID: 0}

--
Gitblit v1.9.1