From c6689f941359227f0b99b20b9400ccbab81b671c Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 14 八月 2018 17:02:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Core/ResModule/AssetBundle/AssetBundleUtility.cs |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Core/ResModule/AssetBundle/AssetBundleUtility.cs b/Core/ResModule/AssetBundle/AssetBundleUtility.cs
index 5c60f9e..9407f90 100644
--- a/Core/ResModule/AssetBundle/AssetBundleUtility.cs
+++ b/Core/ResModule/AssetBundle/AssetBundleUtility.cs
@@ -48,14 +48,14 @@
 
         if (_assetBundle == null)
         {
-            DesignDebug.LogError("AssetBundleManifest鐨勫寘鏂囦欢涓虹┖鎴栬�呭姞杞藉嚭閿�.");
+            DebugEx.LogError("AssetBundleManifest鐨勫寘鏂囦欢涓虹┖鎴栬�呭姞杞藉嚭閿�.");
             yield break;
         }
 
         AssetBundleManifest _assetBundleManifest = _assetBundle.LoadAsset<AssetBundleManifest>(ResourcesPath.AssetDependentFileAssetName);
         if (_assetBundleManifest == null)
         {
-            DesignDebug.LogError("AssetBundleManifest鏂囦欢涓虹┖鎴栬�呭姞杞藉嚭閿�.");
+            DebugEx.LogError("AssetBundleManifest鏂囦欢涓虹┖鎴栬�呭姞杞藉嚭閿�.");
             yield break;
         }
 
@@ -105,7 +105,7 @@
         var _assetBundleInfo = GetAssetBundleInfo(assetBundleName);
         if (_assetBundleInfo == null)
         {
-            DesignDebug.LogErrorFormat("Co_LoadAssetBundle(): {0}鍑虹幇閿欒 => 涓嶅瓨鍦ˋssetBundleInfo. ", assetBundleName);
+            DebugEx.LogErrorFormat("Co_LoadAssetBundle(): {0}鍑虹幇閿欒 => 涓嶅瓨鍦ˋssetBundleInfo. ", assetBundleName);
             yield break;
         }
 
@@ -116,7 +116,7 @@
 
         var filePath = AssetVersionUtility.GetAssetFilePath(assetBundleName);
 
-        DesignDebug.LogFormat("Co_LoadAssetBundle(): 灏嗚鍔犺浇鐨刟ssetBundle鍖呰矾寰� => {0}", filePath);
+        DebugEx.LogFormat("Co_LoadAssetBundle(): 灏嗚鍔犺浇鐨刟ssetBundle鍖呰矾寰� => {0}", filePath);
         var assetBundle = AssetBundle.LoadFromFile(filePath);
         CacheAssetBundle(assetBundleName, assetBundle);
     }
@@ -193,7 +193,7 @@
     {
         if (assetInfo == null)
         {
-            DesignDebug.LogErrorFormat("Co_DoLoadAsset(): {0}, 鍑虹幇閿欒 => 瀛樺叆鐨凙ssetInfo涓簄ull. ", assetInfo);
+            DebugEx.LogErrorFormat("Co_DoLoadAsset(): {0}, 鍑虹幇閿欒 => 瀛樺叆鐨凙ssetInfo涓簄ull. ", assetInfo);
             yield break;
         }
         yield return Co_DoLoadAsset(assetInfo.assetBundleName, assetInfo.name, callBack);
@@ -266,7 +266,7 @@
 
         if (_object == null)
         {
-            DesignDebug.LogErrorFormat("Sync_LoadAsset(): {0} 鍑虹幇閿欒 => null. ", assetName);
+            DebugEx.LogErrorFormat("Sync_LoadAsset(): {0} 鍑虹幇閿欒 => null. ", assetName);
         }
 
         return _object;
@@ -282,7 +282,7 @@
         AssetBundleInfo _assetBundleInfo = GetAssetBundleInfo(assetBundleName);
         if (_assetBundleInfo == null)
         {
-            DesignDebug.LogErrorFormat("Sync_LoadAssetBundle(): {0} 鍑虹幇閿欒 => 涓嶅瓨鍦ˋssetBundleInfo. ", assetBundleName);
+            DebugEx.LogErrorFormat("Sync_LoadAssetBundle(): {0} 鍑虹幇閿欒 => 涓嶅瓨鍦ˋssetBundleInfo. ", assetBundleName);
             return;
         }
 
@@ -336,7 +336,7 @@
 
         if (JudgeExistAssetBundle(assetBundleName) == false)
         {
-            DesignDebug.LogWarningFormat("UnloadAssetBundle(): 瑕佸嵏杞界殑鍖呬笉鍦ㄧ紦瀛樹腑鎴栬�呭凡缁忚鍗歌浇 => {0}. ", assetBundleName);
+            DebugEx.LogWarningFormat("UnloadAssetBundle(): 瑕佸嵏杞界殑鍖呬笉鍦ㄧ紦瀛樹腑鎴栬�呭凡缁忚鍗歌浇 => {0}. ", assetBundleName);
             return;
         }
 
@@ -351,7 +351,7 @@
 
         if (JudgeExistAsset(assetBundleName, assetName) == false)
         {
-            DesignDebug.LogWarningFormat("UnloadAsset(): 瑕佸嵏杞界殑璧勬簮涓嶅湪缂撳瓨涓� => {0}. ", _assembleName);
+            DebugEx.LogWarningFormat("UnloadAsset(): 瑕佸嵏杞界殑璧勬簮涓嶅湪缂撳瓨涓� => {0}. ", _assembleName);
             return;
         }
 
@@ -361,12 +361,12 @@
 
         if (_assetObject is GameObject)
         {
-            DesignDebug.LogFormat("UnloadAsset(): 鎴愬姛鍗歌浇asset璧勬簮 => {0}. 绫诲瀷涓簕1}, 涓嶅仛鍏朵粬澶勭悊. ", assetName, _assetObject.GetType().Name);
+            DebugEx.LogFormat("UnloadAsset(): 鎴愬姛鍗歌浇asset璧勬簮 => {0}. 绫诲瀷涓簕1}, 涓嶅仛鍏朵粬澶勭悊. ", assetName, _assetObject.GetType().Name);
         }
         else
         {
             Resources.UnloadAsset(_assetObject);
-            DesignDebug.LogFormat("UnloadAsset(): 鎴愬姛鍗歌浇asset璧勬簮 => {0}. 绫诲瀷涓簕1}, 鎵цResources.UnloadAsset(). ", assetName, _assetObject.GetType().Name);
+            DebugEx.LogFormat("UnloadAsset(): 鎴愬姛鍗歌浇asset璧勬簮 => {0}. 绫诲瀷涓簕1}, 鎵цResources.UnloadAsset(). ", assetName, _assetObject.GetType().Name);
         }
 
         if (Application.isEditor)
@@ -427,7 +427,7 @@
         }
         else
         {
-            DesignDebug.LogFormat("UnloadAssetBundle(): 瑕佸嵏杞絘ssetBundle鍖� {0} 娌℃湁璧勬簮琚姞杞�. ", assetBundleInfo.name);
+            DebugEx.LogFormat("UnloadAssetBundle(): 瑕佸嵏杞絘ssetBundle鍖� {0} 娌℃湁璧勬簮琚姞杞�. ", assetBundleInfo.name);
         }
 
         // assetBundle鍖呭嵏杞�
@@ -438,7 +438,7 @@
         // 鍗歌浇缂撳瓨鐨刟ssetBundle璧勬簮
         m_AssetBundleDict.Remove(assetBundleInfo.name);
 
-        DesignDebug.LogFormat("UnloadAssetBundle(): 鎴愬姛鍗歌浇assetBundle鍖� => {0}. ", assetBundleInfo.name);
+        DebugEx.LogFormat("UnloadAssetBundle(): 鎴愬姛鍗歌浇assetBundle鍖� => {0}. ", assetBundleInfo.name);
 
         if (Application.isEditor)
         {
@@ -527,7 +527,7 @@
             m_AssetInfoDict[_assembleName] = _assetInfo;
         }
 
-        DesignDebug.LogFormat("CacheAsset(): 鎴愬姛缂撳瓨asset => {0}. ", assetName);
+        DebugEx.LogFormat("CacheAsset(): 鎴愬姛缂撳瓨asset => {0}. ", assetName);
 
         //         if (Application.isEditor)
         //         {
@@ -545,13 +545,13 @@
 
         if (assetBundle == null)
         {
-            DesignDebug.LogErrorFormat("CacheAssetBundle(): {0}鍑虹幇閿欒 => 灏嗚缂撳瓨鐨勫寘涓� null. ", assetBundleName);
+            DebugEx.LogErrorFormat("CacheAssetBundle(): {0}鍑虹幇閿欒 => 灏嗚缂撳瓨鐨勫寘涓� null. ", assetBundleName);
             return;
         }
 
         if (m_AssetBundleDict.ContainsKey(assetBundleName))
         {
-            DesignDebug.LogErrorFormat("CacheAssetBundle(): {0}鍑虹幇閿欒 => 灏嗚缂撳瓨鐨勫寘宸茬粡鍦ㄧ紦瀛樹腑. ", assetBundleName);
+            DebugEx.LogErrorFormat("CacheAssetBundle(): {0}鍑虹幇閿欒 => 灏嗚缂撳瓨鐨勫寘宸茬粡鍦ㄧ紦瀛樹腑. ", assetBundleName);
             return;
         }
 
@@ -593,7 +593,7 @@
             }
         }
 
-        DesignDebug.LogFormat("CacheAssetBundle(): 鎴愬姛缂撳瓨assetBundle鍖呰祫婧� => {0}. 鐩墠鏈� {1} 涓祫婧�.", assetBundleName, m_AssetBundleDict.Count);
+        DebugEx.LogFormat("CacheAssetBundle(): 鎴愬姛缂撳瓨assetBundle鍖呰祫婧� => {0}. 鐩墠鏈� {1} 涓祫婧�.", assetBundleName, m_AssetBundleDict.Count);
     }
 
 }

--
Gitblit v1.8.0