From 00d47de2f5c810542c1668c153f47f38122a47c6 Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 12 Nov 2020 20:23:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/00000/package/Materials/EffectShader_AddUvflow_004.mat | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Assets/00000/package/Materials/EffectShader_AddUvflow_004.mat b/Assets/00000/package/Materials/EffectShader_AddUvflow_004.mat
index 6efc36c..39aba27 100644
--- a/Assets/00000/package/Materials/EffectShader_AddUvflow_004.mat
+++ b/Assets/00000/package/Materials/EffectShader_AddUvflow_004.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: EffectShader_AddUvflow 1
+ m_Name: EffectShader_AddUvflow_004
m_Shader: {fileID: 4800000, guid: 9664b3bfa7ddd0b408841f00f5e268ae, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
--
Gitblit v1.9.1