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_040.mat |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Assets/00000/package/Materials/Glow_040.mat b/Assets/00000/package/Materials/Glow_040.mat
index d959381..431fd03 100644
--- a/Assets/00000/package/Materials/Glow_040.mat
+++ b/Assets/00000/package/Materials/Glow_040.mat
@@ -8,7 +8,7 @@
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Glow_040
-  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0

--
Gitblit v1.9.1