Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

art_wzw

2018-11-06 8355b79d1f7055bb874bf53839c37ebcf6e7bdb1

 Effects/ShenBing/Fs/HunDun/Texture.meta

copy from Effects/TaoZhuang/FuShou.meta
copy to Effects/ShenBing/Fs/HunDun/Texture.meta
File was copied from Effects/TaoZhuang/FuShou.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: d6772cb43d9ea1b42a407161fb82a5f0
guid: 6fdc558f007015640bda0c85b3ff7bbe
folderAsset: yes
timeCreated: 1541487371
timeCreated: 1541503567
licenseType: Pro
DefaultImporter:
  userData: