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/Object_025.mat | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Assets/00000/package/Materials/Object_025.mat b/Assets/00000/package/Materials/Object_025.mat
index c6d4df5..6ed80af 100644
--- a/Assets/00000/package/Materials/Object_025.mat
+++ b/Assets/00000/package/Materials/Object_025.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: "1920\u6C34\u667610"
+ m_Name: Object_025
m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
--
Gitblit v1.9.1