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

diff --git a/Assets/Materials/PVPTD/Materials/water.mat b/Assets/Materials/PVPTD/Materials/water.mat
index 418af5b..797d7bd 100644
--- a/Assets/Materials/PVPTD/Materials/water.mat
+++ b/Assets/Materials/PVPTD/Materials/water.mat
@@ -40,7 +40,7 @@
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: e3c24f50f3e1033428eea30cb0d11d27, type: 3}
+        m_Texture: {fileID: 2800000, guid: e6af1629e2d5940429dda2ecc263f44e, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

--
Gitblit v1.9.1