From 7da5f5b780af330ecda645f5538e0917bd9eeb01 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 九月 2018 19:37:20 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能

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

diff --git a/Core/GameEngine/Model/Config/EquipGSParamConfig.cs.meta b/Core/GameEngine/Model/Config/EquipGSParamConfig.cs.meta
index 02ccef0..f984469 100644
--- a/Core/GameEngine/Model/Config/EquipGSParamConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/EquipGSParamConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: e238f9455d4062c4c867b41cfea2f046
-timeCreated: 1535787590
+timeCreated: 1537960022
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0