From 7b9712f33f42b14e4d277166fa533a379021312d Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 18 Dec 2020 09:52:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/00000/package/Materials/Object_036.mat | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Assets/00000/package/Materials/Object_036.mat b/Assets/00000/package/Materials/Object_036.mat
index 21f5bc9..3718470 100644
--- a/Assets/00000/package/Materials/Object_036.mat
+++ b/Assets/00000/package/Materials/Object_036.mat
@@ -20,7 +20,7 @@
serializedVersion: 3
m_TexEnvs:
- _MainTex:
- m_Texture: {fileID: 2800000, guid: 3a9c88a2223e7a341964ace97e6aec02, type: 3}
+ m_Texture: {fileID: 2800000, guid: a67fa4e3f0b7086499ad172d8a083d7f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
--
Gitblit v1.9.1