From 038699f5a5bf446d3dd17642f97d9c297a2d4a35 Mon Sep 17 00:00:00 2001
From: art_wzw <1151373633@qq.com>
Date: 星期三, 22 八月 2018 15:57:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

---
 Effects/Skill/Fs/Skill14/Model.meta |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Effects/y_moxing/yuan_05.fbm.meta b/Effects/Skill/Fs/Skill14/Model.meta
similarity index 66%
copy from Effects/y_moxing/yuan_05.fbm.meta
copy to Effects/Skill/Fs/Skill14/Model.meta
index 061a4c3..9e8fdab 100644
--- a/Effects/y_moxing/yuan_05.fbm.meta
+++ b/Effects/Skill/Fs/Skill14/Model.meta
@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 4f8cc457386f33b408302b187f99ff59
+guid: 156b8e4d71b09984ab1bd8b80dea64a6
 folderAsset: yes
-timeCreated: 1534044944
+timeCreated: 1534831139
 licenseType: Pro
 DefaultImporter:
   userData: 

--
Gitblit v1.8.0