From 3bb4240736bcc31a7e0ff30161a7d237ae8f0c30 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 21 八月 2018 14:03:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer

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

diff --git a/Core/GameEngine/Model/Config/TrialRewardsConfig.cs.meta b/Core/GameEngine/Model/Config/TrialRewardsConfig.cs.meta
index e820715..0669ca1 100644
--- a/Core/GameEngine/Model/Config/TrialRewardsConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/TrialRewardsConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: ee2212e198950744b9c7524b9d74d042
-timeCreated: 1534748051
+timeCreated: 1534819587
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0