From 0e3f372bcfe4695fe4bbe0e1e829bca2a8bb8ebf Mon Sep 17 00:00:00 2001
From: SAIPO <grasste0403@hotmail.com>
Date: Sat, 14 Aug 2021 04:44:23 +0800
Subject: [PATCH] 1

---
 .../Fungus-PlayMaker.unitypackage.meta        |  7 ---
 .../Spine/Fungus-Spine.unitypackage.meta      |  7 ---
 Assets/图/动画包.unitypackage.meta            |  7 ---
 UserSettings/EditorUserSettings.asset         | 43 -------------------
 4 files changed, 64 deletions(-)
 delete mode 100644 Assets/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta
 delete mode 100644 Assets/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta
 delete mode 100644 Assets/图/动画包.unitypackage.meta

diff --git a/Assets/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta b/Assets/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta
deleted file mode 100644
index e474937..0000000
--- a/Assets/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 81dbcde0f90df4e9ba9ca2794490e57a
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta b/Assets/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta
deleted file mode 100644
index eebd079..0000000
--- a/Assets/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: fd02c799f3f5c4c83b2fc26c105a3821
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/图/动画包.unitypackage.meta b/Assets/图/动画包.unitypackage.meta
deleted file mode 100644
index b3cb06c..0000000
--- a/Assets/图/动画包.unitypackage.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 73111a550ebd15b44943e6d155181519
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index fc29fde..d2ce6fb 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -5,49 +5,6 @@ EditorUserSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 4
   m_ConfigSettings:
-    RecentlyUsedScenePath-0:
-<<<<<<< HEAD
-      value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18
-=======
-      value: 22424703114646680e0b0227036c721f04041d09232c2304283a097df7ee3d2cfb
->>>>>>> 2781f7f874d8b595397c9bc5108186d845fe6bb0
-      flags: 0
-    RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb7df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb73663ffabe163e78fce9332b25
-      flags: 0
-    RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
-      flags: 0
-    RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036cdafade90ecf1aafdcdb8e2dc99eb0c69f6dc6a20dea7f234362820
-      flags: 0
-    RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
-      flags: 0
-<<<<<<< HEAD
-    RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
-      flags: 0
-=======
-    RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18
-      flags: 0
-    UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba85e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b0968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
-      flags: 0
-    UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
-      flags: 0
-    UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf
-      flags: 0
->>>>>>> 2781f7f874d8b595397c9bc5108186d845fe6bb0
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0