From 8ebdcb8980b7a630beb6a1ff82381baa0ab2ddb5 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期四, 04 七月 2019 13:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into LuaOrgan

---
 Core/GameEngine/Model/TelPartialConfig/PartialReikiRootEffectConfig.cs.meta |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/Role/EquipShowSwitch.cs.meta b/Core/GameEngine/Model/TelPartialConfig/PartialReikiRootEffectConfig.cs.meta
similarity index 75%
copy from System/Role/EquipShowSwitch.cs.meta
copy to Core/GameEngine/Model/TelPartialConfig/PartialReikiRootEffectConfig.cs.meta
index d42c3fc..061a684 100644
--- a/System/Role/EquipShowSwitch.cs.meta
+++ b/Core/GameEngine/Model/TelPartialConfig/PartialReikiRootEffectConfig.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 01dcfe375cd5cf940bd33f6b2f4db077
-timeCreated: 1547125411
+guid: f3e0173ec3f51b94d85e81e0184d23ee
+timeCreated: 1562140159
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0