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/TrialRewardsConfig.cs.meta |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/System/Role/RolePoint.cs.meta b/Core/GameEngine/Model/Config/TrialRewardsConfig.cs.meta
similarity index 68%
copy from System/Role/RolePoint.cs.meta
copy to Core/GameEngine/Model/Config/TrialRewardsConfig.cs.meta
index 8d0a009..e820715 100644
--- a/System/Role/RolePoint.cs.meta
+++ b/Core/GameEngine/Model/Config/TrialRewardsConfig.cs.meta
@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 77a6a757b99422846bb5b68b65b5af18
-timeCreated: 1502422861
-licenseType: Free
+guid: ee2212e198950744b9c7524b9d74d042
+timeCreated: 1534748051
+licenseType: Pro
 MonoImporter:
   serializedVersion: 2
   defaultReferences: []

--
Gitblit v1.8.0