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

client_Wu Xijin

2018-11-10 1036f630180a5c4b1f2083dc34dedb7adb81ab61

 Assets/XLua/Gen/SettingMgrWrap.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: bfaaed0f073fedb4aa2273ca246191de
timeCreated: 1541813767
timeCreated: 1541830553
licenseType: Pro
MonoImporter:
  serializedVersion: 2