This repository was archived by the owner on Jul 11, 2023. It is now read-only.

Commit b88cde3

committed

修改Addressable label为交集获取

1 parent df63895 commit b88cde3Copy full SHA for b88cde3

File tree

+19

-4

lines changed

+19

-4

lines changed

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public static string ShellBuild(string activeProfileId = "Default")`
`36`	`36`	`@string.AppendLine(item.address);`
`37`	`37`	`}`
`38`	`38`	`//将被修改过的资源单独分组`
`39`		`- var groupName = string.Format("UpdateGroup_{0}_", System.DateTime.Now.ToString("yyyyMMdd"));`
	`39`	`+ var groupName = string.Format("UpdateGroup_{0}#", System.DateTime.Now.ToString("yyyyMMdd"));`
`40`	`40`	`ContentUpdateScript.CreateContentUpdateGroup(settings, entries, groupName);`
`41`	`41`	`Debug.Log($"Update content:{@string}");`
`42`	`42`	`AssetDatabase.Refresh();`
`@@ -57,8 +57,19 @@ public static string ShellBuild(string activeProfileId = "Default")`
`57`	`57`	`return settings.RemoteCatalogBuildPath.GetValue(settings);`
`58`	`58`
`59`	`59`	`return "";`
	`60`	`+ }`
`60`	`61`
	`62`	`+ public static void ShellBuildPlayerContent(string activeProfileId = "Default")`
	`63`	`+ {`
	`64`	`+ var settings = AddressableAssetSettingsDefaultObject.Settings;`
	`65`	`+ if (settings != null && settings.BuildRemoteCatalog)`
	`66`	`+ {`
	`67`	`+ var profileId = settings.profileSettings.GetProfileId(activeProfileId);`
	`68`	`+ settings.activeProfileId = profileId;`
	`69`	`+ }`
	`70`	`+ AddressableAssetSettings.BuildPlayerContent();`
	`71`	`+ AssetDatabase.Refresh();`
`61`	`72`	`}`
`62`		`-`
	`73`	`+`
`63`	`74`	`}`
`64`	`75`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public T[] FindAssets<T>(List<string> tags) where T : UnityEngine.Object`
`54`	`54`	`{`
`55`	`55`	`var handle= Addressables.LoadAssetsAsync<T>(tags, (tObject) =>`
`56`	`56`	`{`
`57`		`- },Addressables.MergeMode.Intersection);`
	`57`	`+ },Addressables.MergeMode.Union);`
`58`	`58`
`59`	`59`	`var resultList= handle.WaitForCompletion();`
`60`	`60`	`T[] result = new T[resultList.Count];`
`@@ -66,7 +66,7 @@ public void FindAssets<T>(List<string> tags, Action<T[]> callback) where T : Uni`
`66`	`66`	`{`
`67`	`67`	`var handle = Addressables.LoadAssetsAsync<T>(tags, (tObject) =>`
`68`	`68`	`{`
`69`		`- }, Addressables.MergeMode.Intersection);`
	`69`	`+ }, Addressables.MergeMode.Union);`
`70`	`70`
`71`	`71`	`handle.Completed += (resultHandle) => {`
`72`	`72`	`var resultList = resultHandle.Result;`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,11 @@ private UIView GetUIView(IUIContext uiContext)`
`314`	`314`	`GameObject uiViewClone = GameObject.Instantiate(uiViewSource, _uiViewParent);`
`315`	`315`	`uiView = uiViewClone.GetComponent<UIView>();`
`316`	`316`	`if (uiView == null)`
	`317`	`+ {`
	`318`	`+ MonoBehaviour.Destroy(uiViewClone);`
`317`	`319`	`return null;`
	`320`	`+ }`
	`321`	`+ uiViewClone.layer = LayerMask.NameToLayer("UI");`
`318`	`322`	`_allUIView[uiContext] = uiView;`
`319`	`323`	`uiView.OnInit(uiContext);`
`320`	`324`	`loadTime = Time.realtimeSinceStartup- loadTime;`

Comments

(0)