From 0beab784e9d7b5b1844c5e5e19e8d083030baa74 Mon Sep 17 00:00:00 2001
From: art_lxj <1234123@qq.com>
Date: 星期四, 11 十月 2018 16:56:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

---
 Effects/Skill/Fs/Skill14/Materials/Fs_Skill14_03.mat |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Effects/Skill/Fs/Skill14/Materials/05.mat b/Effects/Skill/Fs/Skill14/Materials/Fs_Skill14_03.mat
similarity index 98%
copy from Effects/Skill/Fs/Skill14/Materials/05.mat
copy to Effects/Skill/Fs/Skill14/Materials/Fs_Skill14_03.mat
index 4fbdf54..8b741d2 100644
--- a/Effects/Skill/Fs/Skill14/Materials/05.mat
+++ b/Effects/Skill/Fs/Skill14/Materials/Fs_Skill14_03.mat
@@ -6,7 +6,7 @@
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  m_Name: 05
+  m_Name: Fs_Skill14_03
   m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: 
   m_LightmapFlags: 4

--
Gitblit v1.8.0