From 4ba12b5ea8513673294833f327aef805efc158f0 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 19 二月 2019 11:47:26 +0800
Subject: [PATCH] Merge branch 'ClearUp'

---
 Core/ResModule/UILoader.cs |  110 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 103 insertions(+), 7 deletions(-)

diff --git a/Core/ResModule/UILoader.cs b/Core/ResModule/UILoader.cs
index ff7bc52..07d91dc 100644
--- a/Core/ResModule/UILoader.cs
+++ b/Core/ResModule/UILoader.cs
@@ -11,17 +11,17 @@
     readonly static string PREFAB_EXTERSION = ".prefab";
     readonly static string SPRITE_EXTERSION = ".png";
 
-    public static GameObject LoadWindow(string _name)
+    public static GameObject LoadWindow(string name)
     {
         GameObject window = null;
         if (AssetSource.uiFromEditor)
         {
 #if UNITY_EDITOR
-            var isPriority = PriorityWindowConfig.Get().priorityWindows.Contains(_name);
+            var isPriority = PriorityWindowConfig.Get().priorityWindows.Contains(name);
 
             var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath,
                                                                 isPriority ? ResourcesPath.UI_PRIORITYWINDOW_SUFFIX : ResourcesPath.UI_WINDOW_SUFFIX, "/",
-                                                                _name,
+                                                                name,
                                                                 PREFAB_EXTERSION);
 
             window = UnityEditor.AssetDatabase.LoadAssetAtPath<GameObject>(path);
@@ -29,16 +29,16 @@
         }
         else
         {
-            var isPriority = PriorityWindowConfig.Get().priorityWindows.Contains(_name);
-            var bundleName = isPriority ? ResourcesPath.UI_PRIORITYWINDOW_SUFFIX.ToLower() : ResourcesPath.UI_WINDOW_SUFFIX.ToLower();
-            var assetInfo = new AssetInfo(bundleName, _name);
+            var isPriority = PriorityWindowConfig.Get().priorityWindows.Contains(name);
+            var bundleName = isPriority ? "ui/prioritywindow" : "ui/window";
+            var assetInfo = new AssetInfo(bundleName, name);
 
             window = AssetBundleUtility.Instance.Sync_LoadAsset(assetInfo) as GameObject;
         }
 
         if (window == null)
         {
-            DebugEx.LogErrorFormat("UILoader.LoadWindow() => 鍔犺浇涓嶅埌璧勬簮: {0}.", _name);
+            DebugEx.LogErrorFormat("UILoader.LoadWindow() => 鍔犺浇涓嶅埌璧勬簮: {0}.", name);
         }
 
         return window;
@@ -215,4 +215,100 @@
         }
     }
 
+    public static GameObject LoadTreasure(string folder, string name)
+    {
+        GameObject prefab = null;
+        if (AssetSource.uiFromEditor)
+        {
+#if UNITY_EDITOR
+            var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath,
+                                                                   "UI/Treasure/", folder, "/",
+                                                                   name,
+                                                                   PREFAB_EXTERSION);
+
+            prefab = UnityEditor.AssetDatabase.LoadAssetAtPath<GameObject>(path);
+#endif
+        }
+        else
+        {
+            var bundleName = StringUtility.Contact("ui/treasure/", folder).ToLower();
+            var assetInfo = new AssetInfo(bundleName, name);
+
+            prefab = AssetBundleUtility.Instance.Sync_LoadAsset(assetInfo) as GameObject;
+        }
+
+        if (prefab == null)
+        {
+            DebugEx.LogErrorFormat("UILoader.LoadPrefab() => 鍔犺浇涓嶅埌璧勬簮: {0}.", name);
+        }
+
+        return prefab;
+    }
+
+    public static void UnLoadTreasure(string folder, string _assetName)
+    {
+        if (!AssetSource.uiFromEditor)
+        {
+            AssetBundleUtility.Instance.UnloadAsset(StringUtility.Contact("ui/treasure/", folder).ToLower(), _assetName);
+        }
+    }
+
+    public static GameObject LoadGodWeapon(string _name)
+    {
+        GameObject prefab = null;
+        if (AssetSource.uiFromEditor)
+        {
+#if UNITY_EDITOR
+            var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath,
+                                                                   "UI/Weapon/",
+                                                                   _name,
+                                                                   PREFAB_EXTERSION);
+
+            prefab = UnityEditor.AssetDatabase.LoadAssetAtPath<GameObject>(path);
+#endif
+        }
+        else
+        {
+            var bundleName = "ui/weapon";
+            var assetInfo = new AssetInfo(bundleName, _name);
+            prefab = AssetBundleUtility.Instance.Sync_LoadAsset(assetInfo) as GameObject;
+        }
+
+        if (prefab == null)
+        {
+            DebugEx.LogErrorFormat("UILoader.LoadGodWeapon() => 鍔犺浇涓嶅埌璧勬簮: {0}.", _name);
+        }
+
+        return prefab;
+    }
+
+    public static GameObject LoadBossShow(string _name)
+    {
+        GameObject prefab = null;
+        if (AssetSource.uiFromEditor)
+        {
+#if UNITY_EDITOR
+            var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath,
+                                                                   "UI/BossShow/",
+                                                                   _name,
+                                                                   PREFAB_EXTERSION);
+
+            prefab = UnityEditor.AssetDatabase.LoadAssetAtPath<GameObject>(path);
+#endif
+        }
+        else
+        {
+            var bundleName = "ui/bossshow";
+            var assetInfo = new AssetInfo(bundleName, _name);
+            prefab = AssetBundleUtility.Instance.Sync_LoadAsset(assetInfo) as GameObject;
+        }
+
+        if (prefab == null)
+        {
+            DebugEx.LogErrorFormat("UILoader.LoadBossShow() => 鍔犺浇涓嶅埌璧勬簮: {0}.", _name);
+        }
+
+        return prefab;
+    }
+
 }

--
Gitblit v1.8.0