From 339bf59f7fb280864477a3685c1121361bcfd011 Mon Sep 17 00:00:00 2001
From: art_wzw <1151373633@qq.com>
Date: 星期一, 13 八月 2018 20:48:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
---
Effects/UI/Z_DajingJie/Material/036.mat | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Effects/UI/Z_DajingJie/Material/020.mat b/Effects/UI/Z_DajingJie/Material/036.mat
similarity index 91%
copy from Effects/UI/Z_DajingJie/Material/020.mat
copy to Effects/UI/Z_DajingJie/Material/036.mat
index 9326b00..7ed0ff5 100644
--- a/Effects/UI/Z_DajingJie/Material/020.mat
+++ b/Effects/UI/Z_DajingJie/Material/036.mat
@@ -6,7 +6,7 @@
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
- m_Name: 020
+ m_Name: 036
m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
@@ -39,7 +39,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 661c82cc39ecd044a90b393784df2a7b, type: 3}
+ m_Texture: {fileID: 2800000, guid: b277a54ee65d67545bf3e2678b0e0df0, 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: 1, g: 1, b: 1, a: 0}
+ - _TintColor: {r: 0.9264706, g: 0.39511245, b: 0.4500803, a: 0.897}
--
Gitblit v1.8.0