From 113773fd17d79cb9fefc1c6137f37ea94dc56ef6 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 18 八月 2018 16:33:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

---
 Maps/A_Map_TongYong/Texture_2/30.png.meta |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_05.png.meta b/Maps/A_Map_TongYong/Texture_2/30.png.meta
similarity index 96%
rename from Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_05.png.meta
rename to Maps/A_Map_TongYong/Texture_2/30.png.meta
index 240d24c..986a742 100644
--- a/Maps/Model/Map102_bzjyc/Effect/Texture/Effect_Bzjyc_05.png.meta
+++ b/Maps/A_Map_TongYong/Texture_2/30.png.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a9a6b7264d521e34ab54b02a5c963e2a
+guid: 2a025a65f4a824d488b690275767fc84
 timeCreated: 1526635871
 licenseType: Pro
 TextureImporter:

--
Gitblit v1.8.0