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

client_Wu Xijin

2018-11-10 1036f630180a5c4b1f2083dc34dedb7adb81ab61

 Assets/XLua/Gen/CapacityDelayModelWrap.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 09eb6359353f4eb4e8119e6adcd3c9cb
timeCreated: 1540559656
timeCreated: 1541830543
licenseType: Pro
MonoImporter:
  serializedVersion: 2