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/GameEngine/Model/Config/DemonJarConfig.cs.meta |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Core/GameEngine/Model/Config/DemonJarConfig.cs.meta b/Core/GameEngine/Model/Config/DemonJarConfig.cs.meta
index 1cbe5ff..5277fdc 100644
--- a/Core/GameEngine/Model/Config/DemonJarConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/DemonJarConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 7e442059ea96745478dd5787f9e84ef5
-timeCreated: 1535448421
+timeCreated: 1538136681
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0