From 6e42b7d4f0370f9659aa397ff909aab477a3e676 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 23 一月 2019 14:30:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into SpringFestival

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

diff --git a/Core/GameEngine/Model/Config/FightPowerParamConfig.cs.meta b/Core/GameEngine/Model/Config/FightPowerParamConfig.cs.meta
index 853190c..e9622b5 100644
--- a/Core/GameEngine/Model/Config/FightPowerParamConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/FightPowerParamConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 81c3ee0874f68494d9284a3240009448
-timeCreated: 1527846597
+timeCreated: 1548149194
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0