Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-15 788de3fdfa8fd193ae2e1d374aa0587fc91221fb

 System/OpenServerActivity/OpenServerActivityNotifyBase.cs.meta

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