From 7cd4eee939cdf4700a7eac8d3b5e27650a370776 Mon Sep 17 00:00:00 2001
From: art_dzg <66456565@qq.com>
Date: 星期四, 10 一月 2019 21:12:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art into origin/master

---
 Effects/ShenBing/Fs/GongJi/Materials/1024.mat |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Effects/ShenBing/Fs/GongJi/Materials/1024.mat b/Effects/ShenBing/Fs/GongJi/Materials/1024.mat
index e224721..8d2a464 100644
--- a/Effects/ShenBing/Fs/GongJi/Materials/1024.mat
+++ b/Effects/ShenBing/Fs/GongJi/Materials/1024.mat
@@ -43,7 +43,7 @@
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 5f389ce3574d64049bacbee731e95965, type: 3}
+        m_Texture: {fileID: 2800000, guid: 4545d6734fad72843be9d8126a026ff4, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: -0.19}
     - _MetallicGlossMap:
@@ -94,4 +94,4 @@
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _FlowColor: {r: 1, g: 1, b: 1, a: 1}
     - _SelfLuminousColor: {r: 1, g: 1, b: 1, a: 1}
-    - _TintColor: {r: 0.9779411, g: 0.4026816, b: 0.8430527, a: 0.072}
+    - _TintColor: {r: 0.8897059, g: 0.43831098, b: 0.7838616, a: 0.122}

--
Gitblit v1.8.0