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_033.mat |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Assets/00000/package/Materials/Object_033.mat b/Assets/00000/package/Materials/Object_033.mat
index a7194bc..67957c9 100644
--- a/Assets/00000/package/Materials/Object_033.mat
+++ b/Assets/00000/package/Materials/Object_033.mat
@@ -20,7 +20,7 @@
     serializedVersion: 3
     m_TexEnvs:
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: ea504d77875dbac4c88a324f6cf3d29e, type: 3}
+        m_Texture: {fileID: 2800000, guid: 5099f8038b7f21447a27228f8675b446, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:

--
Gitblit v1.9.1