修改Addressable label为交集获取

Author: coding2233

GameFramework/Editor/AddressablesEditor/AddressablesEditor.cs

@@ -36,7 +36,7 @@ public static string ShellBuild(string activeProfileId = "Default")
                             @string.AppendLine(item.address);
                         }
                         //将被修改过的资源单独分组
-                        var groupName = string.Format("UpdateGroup_{0}_", System.DateTime.Now.ToString("yyyyMMdd"));
+                        var groupName = string.Format("UpdateGroup_{0}#", System.DateTime.Now.ToString("yyyyMMdd"));
                         ContentUpdateScript.CreateContentUpdateGroup(settings, entries, groupName);
                         Debug.Log($"Update content:{@string}");
                         AssetDatabase.Refresh();
@@ -57,8 +57,19 @@ public static string ShellBuild(string activeProfileId = "Default")
                 return settings.RemoteCatalogBuildPath.GetValue(settings);
 
             return "";
+        }
 
+        public static void ShellBuildPlayerContent(string activeProfileId = "Default")
+        {
+            var settings = AddressableAssetSettingsDefaultObject.Settings;
+            if (settings != null && settings.BuildRemoteCatalog)
+            {
+                var profileId = settings.profileSettings.GetProfileId(activeProfileId);
+                settings.activeProfileId = profileId;
+            }
+            AddressableAssetSettings.BuildPlayerContent();
+            AssetDatabase.Refresh();
         }
-         
+
     }
 }

GameFramework/Runtime/Resource/AddressablesAssetsHelper.cs

@@ -54,7 +54,7 @@ public T[] FindAssets<T>(List<string> tags) where T : UnityEngine.Object
         {
             var handle= Addressables.LoadAssetsAsync<T>(tags, (tObject) =>
             {
-            },Addressables.MergeMode.Intersection);
+            },Addressables.MergeMode.Union);
 
             var resultList= handle.WaitForCompletion();
             T[] result = new T[resultList.Count];
@@ -66,7 +66,7 @@ public void FindAssets<T>(List<string> tags, Action<T[]> callback) where T : Uni
         {
             var handle = Addressables.LoadAssetsAsync<T>(tags, (tObject) =>
             {
-            }, Addressables.MergeMode.Intersection);
+            }, Addressables.MergeMode.Union);
 
             handle.Completed += (resultHandle) => {
                 var resultList = resultHandle.Result;

GameFramework/Runtime/UI/UIManager.cs

@@ -314,7 +314,11 @@ private UIView GetUIView(IUIContext uiContext)
                 GameObject uiViewClone = GameObject.Instantiate(uiViewSource, _uiViewParent);
                 uiView = uiViewClone.GetComponent<UIView>();
                 if (uiView == null)
+                {
+                    MonoBehaviour.Destroy(uiViewClone);
                     return null;
+                }
+                uiViewClone.layer = LayerMask.NameToLayer("UI");
                 _allUIView[uiContext] = uiView;
                 uiView.OnInit(uiContext);
                 loadTime = Time.realtimeSinceStartup- loadTime;