Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-15 788de3fdfa8fd193ae2e1d374aa0587fc91221fb

 System/OpenServerActivity/OpenServerActivityNotifyModel.cs.meta

copy from Core/GameEngine/Model/Config/BlastFurnaceLVConfig.cs.meta
copy to System/OpenServerActivity/OpenServerActivityNotifyModel.cs.meta
File was copied from Core/GameEngine/Model/Config/BlastFurnaceLVConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 1bbbc87171e60f949bb6b7572c73fa38
timeCreated: 1515213620
guid: 2a78df4065d071145b2e5877404cd6fd
timeCreated: 1539572551
licenseType: Pro
MonoImporter:
  serializedVersion: 2