From 41a3394f23fabe1319e9edf8569c7b70499ff4ab Mon Sep 17 00:00:00 2001
From: art_zongting <234234@qq.com>
Date: 星期二, 28 八月 2018 20:00:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
---
Role/B_Cw20/Effects/Materials/B_Cw20_01.mat | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/Role/B_Cw18/Texture/Materials/B_Cw05_07.mat b/Role/B_Cw20/Effects/Materials/B_Cw20_01.mat
similarity index 62%
copy from Role/B_Cw18/Texture/Materials/B_Cw05_07.mat
copy to Role/B_Cw20/Effects/Materials/B_Cw20_01.mat
index 7c22d32..63b55dc 100644
--- a/Role/B_Cw18/Texture/Materials/B_Cw05_07.mat
+++ b/Role/B_Cw20/Effects/Materials/B_Cw20_01.mat
@@ -6,8 +6,8 @@
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
- m_Name: B_Cw05_07
- m_Shader: {fileID: 4800000, guid: c734192df587b0d41a5736bbfba6676c, type: 3}
+ m_Name: B_Cw20_01
+ m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
@@ -19,15 +19,10 @@
serializedVersion: 3
m_TexEnvs:
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 4940d158f41ad8c46875d44cddd062d4, type: 3}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _NoiseTex:
- m_Texture: {fileID: 0}
+ m_Texture: {fileID: 2800000, guid: 0b8e088bbc441074f93740ff7c71f225, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- - _RollTimeX: 0.2
- - _RollTimeY: 0
+ - _InvFade: 1
m_Colors:
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
--
Gitblit v1.8.0