From 0bd774ab57a54230ad78d3b9224d1f49b9b6dcca Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 25 Nov 2020 21:22:30 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/00000/package/Materials/Object_047.mat | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Assets/00000/package/Materials/Object_047.mat b/Assets/00000/package/Materials/Object_047.mat
index ca7b910..30e7422 100644
--- a/Assets/00000/package/Materials/Object_047.mat
+++ b/Assets/00000/package/Materials/Object_047.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: "\u51C6\u661F1"
+ m_Name: Object_047
m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
--
Gitblit v1.9.1