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

client_Wu Xijin

2018-08-20 94dbe7ffd266608ffcdf5bdfcabd0a393aa6881d

 Core/GameEngine/Model/Config/TrialExchangeConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 95c6c6944c394ac4381e86d9ce3006fb
timeCreated: 1533192458
timeCreated: 1534744580
licenseType: Pro
MonoImporter:
  serializedVersion: 2