From 52fb8c663b1e74b2a36b79bc70a452ca73db6341 Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 12 Nov 2020 17:20:08 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master

---
 Assets/Materials/UI/tileTowerVSMat.mat |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Assets/Materials/UI/tileTowerVSMat.mat b/Assets/Materials/UI/tileTowerVSMat.mat
index 48d981d..29c24ee 100644
--- a/Assets/Materials/UI/tileTowerVSMat.mat
+++ b/Assets/Materials/UI/tileTowerVSMat.mat
@@ -40,7 +40,7 @@
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 8c9a3d26120e78f40aa4ef9ed23d573c, type: 3}
+        m_Texture: {fileID: 2800000, guid: 93f40a01d57fbff418fc0b54b6ab7d9f, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

--
Gitblit v1.9.1