From bf4e1051ef18bf57299d3c830f921864b6fda444 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 十二月 2018 10:38:10 +0800
Subject: [PATCH] Merge branch 'master' into 【1.4】聚魂功能

---
 Core/GameEngine/Model/Config/ResourcesBackConfig.cs.meta |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Core/GameEngine/Model/Config/ResourcesBackConfig.cs.meta b/Core/GameEngine/Model/Config/ResourcesBackConfig.cs.meta
index 8707e12..0f5a7d3 100644
--- a/Core/GameEngine/Model/Config/ResourcesBackConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/ResourcesBackConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 2fdee2899ae3d5d469aabc2daa6c744a
-timeCreated: 1516157851
+timeCreated: 1545210998
 licenseType: Free
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0