From 7cd4eee939cdf4700a7eac8d3b5e27650a370776 Mon Sep 17 00:00:00 2001
From: art_dzg <66456565@qq.com>
Date: 星期四, 10 一月 2019 21:12:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art into origin/master

---
 Maps/Model/Map136_Bzjdc/Effect/Texture/03.png.meta |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Role/M013/Effect/Texture/Guang_1001.png.meta b/Maps/Model/Map136_Bzjdc/Effect/Texture/03.png.meta
similarity index 95%
rename from Role/M013/Effect/Texture/Guang_1001.png.meta
rename to Maps/Model/Map136_Bzjdc/Effect/Texture/03.png.meta
index b06c77a..6dec923 100644
--- a/Role/M013/Effect/Texture/Guang_1001.png.meta
+++ b/Maps/Model/Map136_Bzjdc/Effect/Texture/03.png.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 43dee1e1bea2d52458884dabbc43709f
-timeCreated: 1526636081
+guid: 13e8000a52d2d894394fbcec1797c3ea
+timeCreated: 1526635945
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}

--
Gitblit v1.8.0