From 41828c2cba250056b6cd2cf03ca18fb3ef955504 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 11 三月 2019 20:59:40 +0800
Subject: [PATCH] Merge branch 'Equip'

---
 Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/NetworkPackage/DTCFile/ClientPack.meta b/Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
similarity index 66%
rename from Core/NetworkPackage/DTCFile/ClientPack.meta
rename to Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
index a5a6f03..314efd1 100644
--- a/Core/NetworkPackage/DTCFile/ClientPack.meta
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HAF_Merge.meta
@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 722e5e3d30096674e811f5bd191246a0
+guid: 71e878ac60c49ad4f964dd2dbc725739
 folderAsset: yes
-timeCreated: 1539228128
+timeCreated: 1547643019
 licenseType: Pro
 DefaultImporter:
   userData: 

--
Gitblit v1.8.0