From 66cb4dd552f68db6e8c98eea90101edb22fc2ec5 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 12 六月 2019 10:05:52 +0800
Subject: [PATCH] Merge branch 'master' into FairyLeague_1

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

diff --git a/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs.meta b/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs.meta
index cca1a19..75082ed 100644
--- a/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b2d416872ed7b3048a5b2d4696c3541f
-timeCreated: 1560146342
+timeCreated: 1560244979
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0