From c225194393f96e062551b90448ed877f1f230ed9 Mon Sep 17 00:00:00 2001
From: art_wzw <1151373633@qq.com>
Date: 星期二, 18 九月 2018 20:03:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

---
 Effects/Skill/Zs00/Skill14/Material/17.mat |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Effects/Skill/Fs/Skill14/Materials/17.mat b/Effects/Skill/Zs00/Skill14/Material/17.mat
similarity index 92%
rename from Effects/Skill/Fs/Skill14/Materials/17.mat
rename to Effects/Skill/Zs00/Skill14/Material/17.mat
index df26106..8b5d799 100644
--- a/Effects/Skill/Fs/Skill14/Materials/17.mat
+++ b/Effects/Skill/Zs00/Skill14/Material/17.mat
@@ -39,7 +39,7 @@
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 0c44dc7cde0177646adad1f2112370cb, type: 3}
+        m_Texture: {fileID: 2800000, guid: c7a55779fd7dacb4293bdfd607692f58, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
@@ -75,4 +75,4 @@
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _TintColor: {r: 0.39851865, g: 0.5354589, b: 0.8602941, a: 0}
+    - _TintColor: {r: 0.7058823, g: 0.5304856, b: 0.45155707, a: 0}

--
Gitblit v1.8.0