From 038699f5a5bf446d3dd17642f97d9c297a2d4a35 Mon Sep 17 00:00:00 2001
From: art_wzw <1151373633@qq.com>
Date: 星期三, 22 八月 2018 15:57:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

---
 Effects/Skill/Fs/Skill14/Materials/7.mat |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git "a/Role/A_Zs_Cb01/Materials/Material \043200.mat" b/Effects/Skill/Fs/Skill14/Materials/7.mat
similarity index 85%
copy from "Role/A_Zs_Cb01/Materials/Material \043200.mat"
copy to Effects/Skill/Fs/Skill14/Materials/7.mat
index 87b87ef..ecc6665 100644
--- "a/Role/A_Zs_Cb01/Materials/Material \043200.mat"
+++ b/Effects/Skill/Fs/Skill14/Materials/7.mat
@@ -6,8 +6,8 @@
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  m_Name: 'Material #200'
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Name: 7
+  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -39,7 +39,7 @@
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: f5de9375553ed3b4884bec30712eaf17, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
@@ -62,6 +62,7 @@
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _InvFade: 1
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1
@@ -72,5 +73,6 @@
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.588, g: 0.588, b: 0.588, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _TintColor: {r: 0.44117647, g: 0.6300204, b: 1, a: 0}

--
Gitblit v1.8.0