From 4bcda00aa3cb3678f5b42ab86d8624f32a1ec24c Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 24 一月 2019 11:22:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into SpringFestival

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

diff --git a/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs.meta b/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs.meta
index 8dc1b55..6908448 100644
--- a/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/SkillFrameAnimationConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: d2052f17dcdee634082ca8f214df0ecd
-timeCreated: 1548156734
+timeCreated: 1548246768
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0