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

art_wzw

2018-11-24 72c8c61c6ac5eddfb74075c374e4931aa00c1155

 Effects/ShenBing/Zs/GongJi/Texture/22.png.meta

copy from Effects/ShenBing/Zs/HunDun/Texture/04.png.meta
copy to Effects/ShenBing/Zs/GongJi/Texture/22.png.meta
File was copied from Effects/ShenBing/Zs/HunDun/Texture/04.png.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e25fb5ec3b37e224cb85d4b7d0ad6009
timeCreated: 1541765933
guid: db753fc90367b324e9ff55a2a52fc153
timeCreated: 1542956944
licenseType: Pro
TextureImporter:
  fileIDToRecycleName: {}