From f4f07847775c12b338d8bccedbbabc067dc1ae2c Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 18 八月 2018 14:34:26 +0800
Subject: [PATCH] Merge branch '法宝、法宝魂修改'

---
 System/Treasure/TreasureSoulModel.cs.meta |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/Treasure/FairyTreasureCollectPanelPattern1.cs.meta b/System/Treasure/TreasureSoulModel.cs.meta
similarity index 75%
copy from System/Treasure/FairyTreasureCollectPanelPattern1.cs.meta
copy to System/Treasure/TreasureSoulModel.cs.meta
index 735eb11..99a29bb 100644
--- a/System/Treasure/FairyTreasureCollectPanelPattern1.cs.meta
+++ b/System/Treasure/TreasureSoulModel.cs.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: f4d29363b41f2a740834a1aabf805009
-timeCreated: 1521102270
+guid: 546ae13b091e8c845b2c8d0e1a458b39
+timeCreated: 1534406321
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

--
Gitblit v1.8.0