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/Material/01.mat.meta |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Role/M013/Materials/Guang_1001.mat.meta b/Maps/Model/Map136_Bzjdc/Effect/Material/01.mat.meta
similarity index 69%
copy from Role/M013/Materials/Guang_1001.mat.meta
copy to Maps/Model/Map136_Bzjdc/Effect/Material/01.mat.meta
index cda7a20..6d8d035 100644
--- a/Role/M013/Materials/Guang_1001.mat.meta
+++ b/Maps/Model/Map136_Bzjdc/Effect/Material/01.mat.meta
@@ -1,9 +1,9 @@
-fileFormatVersion: 2
-guid: 9d8f190dbb62f9e419dd66713b571ad1
-timeCreated: 1500624154
-licenseType: Pro
-NativeFormatImporter:
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 4b820a155e06beb4a8dc8c9190d22394
+timeCreated: 1503578587
+licenseType: Pro
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

--
Gitblit v1.8.0