From dbceb10cd120b2121cb93b63d50d804bc6f02f16 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 26 二月 2019 11:23:34 +0800
Subject: [PATCH] Merge branch 'master' into ItemReconstruction

---
 System/Skill/SkillWin.cs.meta |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/System/Skill/SkillPanel.cs.meta b/System/Skill/SkillWin.cs.meta
similarity index 99%
rename from System/Skill/SkillPanel.cs.meta
rename to System/Skill/SkillWin.cs.meta
index 41ee99a..1490f70 100644
--- a/System/Skill/SkillPanel.cs.meta
+++ b/System/Skill/SkillWin.cs.meta
@@ -1,12 +1,12 @@
-fileFormatVersion: 2
-guid: c683bffb2de22ee4cbda7aaaa1243e1d
-timeCreated: 1498562046
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: c683bffb2de22ee4cbda7aaaa1243e1d
+timeCreated: 1498562046
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

--
Gitblit v1.8.0