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

client_Hale

2019-03-11 d5f1f8f1553f45d9a2ddece55dfa53df68d95759

 Lua/Gen/XLuaGenAutoRegister.cs.meta

copy from Core/GameEngine/Model/Config/MarketQueryConfig.cs.meta
copy to Lua/Gen/XLuaGenAutoRegister.cs.meta
File was copied from Core/GameEngine/Model/Config/MarketQueryConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 7d32d4c73992bfd4d9a654c18b57a85a
timeCreated: 1550121360
guid: ff2dde43802d1d14795873c131842a1e
timeCreated: 1552276115
licenseType: Pro
MonoImporter:
  serializedVersion: 2