From 5ebd7584f64854d1e398a4b70f0bc087e938e74f Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Sat, 31 Oct 2020 17:59:31 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/Prefabs/Towers/Fire/GrowUpTower_2.prefab |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Assets/Prefabs/Towers/Fire/GrowUpTower_2.prefab b/Assets/Prefabs/Towers/Fire/GrowUpTower_2.prefab
index 3a8d941..30622f9 100644
--- a/Assets/Prefabs/Towers/Fire/GrowUpTower_2.prefab
+++ b/Assets/Prefabs/Towers/Fire/GrowUpTower_2.prefab
@@ -28909,7 +28909,8 @@
   m_Name: 
   m_EditorClassIdentifier: 
   description: Offensive
-  projectile: {fileID: 1746672929845058, guid: b27ceafe15cad0d40a51e518d630263d, type: 3}
+  projectile: {fileID: 2369440489128176080, guid: 0a1b9c8af80fea84588ca8b548e9dac8,
+    type: 3}
   projectilePoints:
   - {fileID: 4575828760328406}
   epicenter: {fileID: 4737672716932362}
@@ -48415,7 +48416,7 @@
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: a33383faa79b34b4faa6a615655b7ebe, type: 2}
+  - {fileID: 2100000, guid: 94110c9a997a3cf4d971aa75155f5351, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

--
Gitblit v1.9.1