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_032.mat | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Assets/00000/package/Materials/Object_032.mat b/Assets/00000/package/Materials/Object_032.mat
index a85a317..7cc722a 100644
--- a/Assets/00000/package/Materials/Object_032.mat
+++ b/Assets/00000/package/Materials/Object_032.mat
@@ -8,7 +8,7 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Object_032
- m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
@@ -20,7 +20,7 @@
serializedVersion: 3
m_TexEnvs:
- _MainTex:
- m_Texture: {fileID: 2800000, guid: a75db2421977ced4db6cfafe1a109534, type: 3}
+ m_Texture: {fileID: 2800000, guid: ea504d77875dbac4c88a324f6cf3d29e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
--
Gitblit v1.9.1