From f8d5689ce369f9239072d3c6a0655725e085387a Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Tue, 15 Dec 2020 16:36:52 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle
---
Assets/00000/package/Materials/Object_015_02.mat | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Assets/00000/package/Materials/Object_016.mat b/Assets/00000/package/Materials/Object_015_02.mat
similarity index 98%
rename from Assets/00000/package/Materials/Object_016.mat
rename to Assets/00000/package/Materials/Object_015_02.mat
index 103791e..9c8d7b4 100644
--- a/Assets/00000/package/Materials/Object_016.mat
+++ b/Assets/00000/package/Materials/Object_015_02.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Object_016
+ m_Name: Object_015_02
m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
--
Gitblit v1.9.1