From a24fb377eb8ba2651f77d8c05e3d822478206793 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 06 六月 2025 16:14:21 +0800
Subject: [PATCH] 18 子 2D卡牌客户端搭建 / 2D卡牌客户端搭建 去掉AssetSource下的resFromEditor 添加了IsUseAssetBundle UIBase添加了防呆的InitComponentIneteral

---
 Main/ResModule/ResManager.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Main/ResModule/ResManager.cs b/Main/ResModule/ResManager.cs
index 4c5ce0b..b8318cb 100644
--- a/Main/ResModule/ResManager.cs
+++ b/Main/ResModule/ResManager.cs
@@ -142,7 +142,7 @@
         T asset = null;
 
         var path = ($"Assets/ResourcesOut/{directory}/{name}" + GetExtension(typeof(T))).Replace("//", "/").Trim().Replace("\\", "/");
-        if (AssetSource.uiFromEditor)
+        if (!AssetSource.isUseAssetBundle)
         {
 #if UNITY_EDITOR
             //  TODO YYL 杩樻槸瑕佹壘鍒板瓧绗︿覆闂
@@ -209,7 +209,7 @@
     {
         var path = string.Concat($"Assets/ResourcesOut/{directory}/{name}", GetExtension(typeof(T))).Replace("//", "/");
 
-        if (AssetSource.uiFromEditor)
+        if (!AssetSource.isUseAssetBundle)
         {
 #if UNITY_EDITOR
             var asset = UnityEditor.AssetDatabase.LoadAssetAtPath<T>(path);
@@ -225,7 +225,7 @@
 
     public void UnloadAsset(string assetBundleName, string assetName)
     {
-        if (AssetSource.uiFromEditor)
+        if (!AssetSource.isUseAssetBundle)
             return;
 
         AssetBundleUtility.Instance.UnloadAsset(assetBundleName, assetName);
@@ -233,7 +233,7 @@
 
     public void UnloadAssetBundle(string assetBundleName, bool unloadAllLoadedObjects, bool includeDependenice)
     {
-        if (AssetSource.uiFromEditor)
+        if (!AssetSource.isUseAssetBundle)
             return;
         AssetBundleUtility.Instance.UnloadAssetBundle(assetBundleName, unloadAllLoadedObjects, includeDependenice);
     }

--
Gitblit v1.8.0