From c5a1b1eb5f845f72b0b3e48fc8c7ccf75cee5831 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 09 十月 2018 10:30:32 +0800
Subject: [PATCH] Merge branch 'master' into 3687天赋功能

---
 Core/NetworkPackage/DebugPkgCache.cs.meta |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Fight/Stage/PaintMapLine.cs.meta b/Core/NetworkPackage/DebugPkgCache.cs.meta
similarity index 68%
copy from Fight/Stage/PaintMapLine.cs.meta
copy to Core/NetworkPackage/DebugPkgCache.cs.meta
index 28bbf6d..dad9db4 100644
--- a/Fight/Stage/PaintMapLine.cs.meta
+++ b/Core/NetworkPackage/DebugPkgCache.cs.meta
@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 9202015b1077a91488a691347bdeafae
-timeCreated: 1508832157
-licenseType: Pro
+guid: 90b1b61b46516f047a22f3e5920983cd
+timeCreated: 1538230240
+licenseType: Free
 MonoImporter:
   serializedVersion: 2
   defaultReferences: []

--
Gitblit v1.8.0