From ab06c43e60fbfaf6699a639766dbed01d35e7f47 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Sat, 31 Oct 2020 18:11:58 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Materials/PVPTD/Materials/fire4.mat | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Assets/Materials/PVPTD/Materials/fire4.mat b/Assets/Materials/PVPTD/Materials/fire4.mat
index ae0b390..62e5351 100644
--- a/Assets/Materials/PVPTD/Materials/fire4.mat
+++ b/Assets/Materials/PVPTD/Materials/fire4.mat
@@ -40,7 +40,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: ef9db705561ea4543800bfbde5df56a9, type: 3}
+ m_Texture: {fileID: 2800000, guid: 62479f5de855f794987e9048d3de5b66, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
--
Gitblit v1.9.1