From 24f59b89e9eabcfe948fc0ba304a8dbec2deda14 Mon Sep 17 00:00:00 2001
From: River Jiang <546213258@qq.com>
Date: Tue, 27 Oct 2020 14:09:47 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Prefabs/Towers/WoodTower/WProjectile_0.prefab | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Assets/Prefabs/Towers/WoodTower/WProjectile_0.prefab b/Assets/Prefabs/Towers/WoodTower/WProjectile_0.prefab
index 57e6092..32abb97 100644
--- a/Assets/Prefabs/Towers/WoodTower/WProjectile_0.prefab
+++ b/Assets/Prefabs/Towers/WoodTower/WProjectile_0.prefab
@@ -14710,7 +14710,7 @@
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 3d38a1de9d28bfd47999f80e1bc2ec3b, type: 2}
+ - {fileID: 2100000, guid: e1689a41e0c34d54c8457ad83a0be379, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -14849,7 +14849,7 @@
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: 9ce328a1f5559164cbdf5601a7f6eb44, type: 2}
+ - {fileID: 2100000, guid: 5a9cdd38978bfb9449c16701258af34b, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -14962,7 +14962,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6418646830064199712}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 1.44}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
m_Children:
- {fileID: 6418646828813334403}
--
Gitblit v1.9.1