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

---
 Role/B_Cw26.meta |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Role/M013/Effect.meta b/Role/B_Cw26.meta
similarity index 66%
copy from Role/M013/Effect.meta
copy to Role/B_Cw26.meta
index abc316e..5d9f3ea 100644
--- a/Role/M013/Effect.meta
+++ b/Role/B_Cw26.meta
@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: aa6eba7dad7ec594eb698b05821aec4e
+guid: 45da172a2fdb2494ca8ced3c298fdc2d
 folderAsset: yes
-timeCreated: 1500624353
+timeCreated: 1547122502
 licenseType: Pro
 DefaultImporter:
   userData: 

--
Gitblit v1.8.0