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

art_wzw

2019-01-10 52552128d5cd208645a5ee2a3db037878a4d228e

 Maps/Model/Map135_Xtmj/Effects/Animation/Animation 1.controller.meta

File was renamed from Maps/Model/Map135_Llxg/Effects/Animation/Animation 1.controller.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 21544cb0ad4696a42a79d2fa30d09ab0
timeCreated: 1545125169
guid: b89ff463764b4c64bb37aeb72b5b9908
timeCreated: 1547109329
licenseType: Pro
NativeFormatImporter:
  mainObjectFileID: 9100000