From 788de3fdfa8fd193ae2e1d374aa0587fc91221fb Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 15 十月 2018 15:13:26 +0800
Subject: [PATCH] Merge branch 'master' into 3687天赋功能

---
 System/OpenServerActivity/OpenServerActivityNotifyWin.cs.meta |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/GameEngine/Model/Config/BlastFurnaceLVConfig.cs.meta b/System/OpenServerActivity/OpenServerActivityNotifyWin.cs.meta
similarity index 75%
rename from Core/GameEngine/Model/Config/BlastFurnaceLVConfig.cs.meta
rename to System/OpenServerActivity/OpenServerActivityNotifyWin.cs.meta
index e3a18b2..3d2fa9c 100644
--- a/Core/GameEngine/Model/Config/BlastFurnaceLVConfig.cs.meta
+++ b/System/OpenServerActivity/OpenServerActivityNotifyWin.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 1bbbc87171e60f949bb6b7572c73fa38
-timeCreated: 1515213620
+guid: aa084ec4d5a2ea446b5ec00c0e1cc687
+timeCreated: 1539422752
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0