From 458f4c831623966402f78d1ec00b24aebf674e66 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 12 十二月 2018 09:46:22 +0800
Subject: [PATCH] Merge branch 'master' into Cross_Server

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

diff --git a/Core/GameEngine/Model/Config/ModelResConfig.cs.meta b/Core/GameEngine/Model/Config/ModelResConfig.cs.meta
index 2969b78..86b0e0b 100644
--- a/Core/GameEngine/Model/Config/ModelResConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/ModelResConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 290b3d02a826d6b4daabb2e80dfaa3ab
-timeCreated: 1543388296
+timeCreated: 1544430338
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0