Merge branch 'master' into DogzDungeon

client_Wu Xijin

2018-08-20 1c4c5c5cb829334303bff98837a69a9653dca714

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

copy from System/Role/RolePoint.cs.meta
copy to Core/GameEngine/Model/Config/TrialRewardsConfig.cs.meta
File was copied from System/Role/RolePoint.cs.meta
@@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 77a6a757b99422846bb5b68b65b5af18
timeCreated: 1502422861
licenseType: Free
guid: ee2212e198950744b9c7524b9d74d042
timeCreated: 1534748051
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []