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/00000/package/Materials/Glow_041.mat |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Assets/00000/package/Materials/Glow_041.mat b/Assets/00000/package/Materials/Glow_041.mat
index bd53cd8..1e414d4 100644
--- a/Assets/00000/package/Materials/Glow_041.mat
+++ b/Assets/00000/package/Materials/Glow_041.mat
@@ -20,7 +20,7 @@
     serializedVersion: 3
     m_TexEnvs:
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: c903e03dfb594b74eb5c6b45d36b87bc, type: 3}
+        m_Texture: {fileID: 2800000, guid: 2d7768e95b252c44d9c1c1856b2bbf7d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:

--
Gitblit v1.9.1