From 1c4c5c5cb829334303bff98837a69a9653dca714 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 20 八月 2018 17:09:49 +0800
Subject: [PATCH] Merge branch 'master' into DogzDungeon

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

diff --git a/Core/GameEngine/Model/Config/NPCConfig.cs.meta b/Core/GameEngine/Model/Config/NPCConfig.cs.meta
index 99ac283..647cb16 100644
--- a/Core/GameEngine/Model/Config/NPCConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/NPCConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 1862c84997887d142ab127719c4d5c7f
-timeCreated: 1533189772
+timeCreated: 1534744183
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0