From 0beab784e9d7b5b1844c5e5e19e8d083030baa74 Mon Sep 17 00:00:00 2001
From: art_lxj <1234123@qq.com>
Date: 星期四, 11 十月 2018 16:56:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
---
Effects/Skill/Zs00/Skill14/Material/Zs_skill14_02.mat | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Effects/Skill/Zs00/Skill14/Material/1.mat b/Effects/Skill/Zs00/Skill14/Material/Zs_skill14_02.mat
similarity index 94%
rename from Effects/Skill/Zs00/Skill14/Material/1.mat
rename to Effects/Skill/Zs00/Skill14/Material/Zs_skill14_02.mat
index 3714412..6329e3a 100644
--- a/Effects/Skill/Zs00/Skill14/Material/1.mat
+++ b/Effects/Skill/Zs00/Skill14/Material/Zs_skill14_02.mat
@@ -6,7 +6,7 @@
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
- m_Name: 1
+ m_Name: Zs_skill14_02
m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
@@ -39,7 +39,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: dc7a31b8c4af320438a9d9c8d33b590c, type: 3}
+ m_Texture: {fileID: 2800000, guid: 21f5f6136297e7043bc47b9130ad2675, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
--
Gitblit v1.8.0