Update Basic Samples

2022-09-22 11:42:13 +08:00 · 2022-09-22 11:42:13 +08:00 · ca83a4450d
parent 8cec0abf0e
commit ca83a4450d
7 changed files with 50 additions and 41 deletions
--- a/Sample/GameScript/Runtime/BootScene.cs
+++ b/Sample/GameScript/Runtime/BootScene.cs
@ -40,7 +40,7 @@ public class BootScene : MonoBehaviour
 		if (PlayMode == YooAssets.EPlayMode.EditorSimulateMode)
 		{
 			var createParameters = new YooAssets.EditorSimulateModeParameters();
-			createParameters.LocationServices = new DefaultLocationServices("Assets/Samples/BasicSample/GameRes");
+			createParameters.LocationServices = new AddressLocationServices();
 			//createParameters.SimulatePatchManifestPath = GetPatchManifestPath();
 			yield return YooAssets.InitializeAsync(createParameters);
 		}
@ -49,7 +49,7 @@ public class BootScene : MonoBehaviour
 		if (PlayMode == YooAssets.EPlayMode.OfflinePlayMode)
 		{
 			var createParameters = new YooAssets.OfflinePlayModeParameters();
-			createParameters.LocationServices = new DefaultLocationServices("Assets/Samples/BasicSample/GameRes");
+			createParameters.LocationServices = new AddressLocationServices();
 			yield return YooAssets.InitializeAsync(createParameters);
 		}

@ -57,7 +57,7 @@ public class BootScene : MonoBehaviour
 		if (PlayMode == YooAssets.EPlayMode.HostPlayMode)
 		{
 			var createParameters = new YooAssets.HostPlayModeParameters();
-			createParameters.LocationServices = new DefaultLocationServices("Assets/Samples/BasicSample/GameRes");
+			createParameters.LocationServices = new AddressLocationServices();
 			createParameters.DecryptionServices = null;
 			createParameters.ClearCacheWhenDirty = false;
 			createParameters.DefaultHostServer = GetHostServerURL();
--- a/Sample/GameScript/Runtime/Game1Scene.cs
+++ b/Sample/GameScript/Runtime/Game1Scene.cs
@ -72,7 +72,7 @@ public class Game1Scene : MonoBehaviour
 #if UNITY_WEBGL
 		{
 			var rawImage = CanvasRoot.transform.Find("background").GetComponent<RawImage>();
-			AssetOperationHandle handle = YooAssets.LoadAssetAsync<Texture>("Texture/bg");
+			AssetOperationHandle handle = YooAssets.LoadAssetAsync<Texture>("bg");
 			_cachedAssetOperationHandles.Add(handle);
 			handle.Completed += (AssetOperationHandle obj) =>
 			{
@ -82,7 +82,7 @@ public class Game1Scene : MonoBehaviour
 #else
 		{
 			var rawImage = CanvasRoot.transform.Find("background").GetComponent<RawImage>();
-			AssetOperationHandle handle = YooAssets.LoadAssetSync<Texture>("Texture/bg");
+			AssetOperationHandle handle = YooAssets.LoadAssetSync<Texture>("bg");
 			_cachedAssetOperationHandles.Add(handle);
 			rawImage.texture = handle.AssetObject as Texture;
 		}
@ -92,7 +92,7 @@ public class Game1Scene : MonoBehaviour
 #if UNITY_WEBGL
 		{
 			var logoImage = CanvasRoot.transform.Find("title/logo").GetComponent<Image>();
-			AssetOperationHandle handle = YooAssets.LoadAssetAsync<Sprite>("Texture/logo.png");
+			AssetOperationHandle handle = YooAssets.LoadAssetAsync<Sprite>("logo");
 			_cachedAssetOperationHandles.Add(handle);
 			handle.Completed += (AssetOperationHandle obj) =>
 			{
@ -102,7 +102,7 @@ public class Game1Scene : MonoBehaviour
 #else
 		{
 			var logoImage = CanvasRoot.transform.Find("title/logo").GetComponent<Image>();
-			AssetOperationHandle handle = YooAssets.LoadAssetSync<Sprite>("Texture/logo.png");
+			AssetOperationHandle handle = YooAssets.LoadAssetSync<Sprite>("logo");
 			_cachedAssetOperationHandles.Add(handle);
 			logoImage.sprite = handle.AssetObject as Sprite;
 		}
@ -112,10 +112,10 @@ public class Game1Scene : MonoBehaviour
 		{
 			string[] entityAssetNames =
 			{
-				"Level1/footman_Blue",
-				"Level2/footman_Green",
-				"Level3/footman_Red",
-				"Level3/footman_Yellow"
+				"footman_Blue",
+				"footman_Green",
+				"footman_Red",
+				"footman_Yellow"
 			};

 			var btn = CanvasRoot.transform.Find("load_npc/btn").GetComponent<Button>();
@ -123,7 +123,7 @@ public class Game1Scene : MonoBehaviour
 			{
 #if UNITY_WEBGL
 				var icon = CanvasRoot.transform.Find("load_npc/icon").GetComponent<Image>();
-				AssetOperationHandle handle = YooAssets.LoadAssetAsync<GameObject>($"Entity/{entityAssetNames[_npcIndex]}");
+				AssetOperationHandle handle = YooAssets.LoadAssetAsync<GameObject>($"{entityAssetNames[_npcIndex]}");
 				_cachedAssetOperationHandles.Add(handle);
 				handle.Completed += (AssetOperationHandle op) =>
 				{
@ -134,7 +134,7 @@ public class Game1Scene : MonoBehaviour
 				};
 #else
 				var icon = CanvasRoot.transform.Find("load_npc/icon").GetComponent<Image>();		
-				AssetOperationHandle handle = YooAssets.LoadAssetSync<GameObject>($"Entity/{entityAssetNames[_npcIndex]}");
+				AssetOperationHandle handle = YooAssets.LoadAssetSync<GameObject>($"{entityAssetNames[_npcIndex]}");
 				_cachedAssetOperationHandles.Add(handle);
 				GameObject go = handle.InstantiateSync(icon.transform);
 				go.transform.localPosition = new Vector3(0, -50, -100);
@ -152,7 +152,7 @@ public class Game1Scene : MonoBehaviour
 			var btn = CanvasRoot.transform.Find("load_unity_atlas/btn").GetComponent<Button>();
 			btn.onClick.AddListener(() =>
 			{
-				AssetOperationHandle handle = YooAssets.LoadAssetAsync<Sprite>("UISprite/Icon_Leafs_128");
+				AssetOperationHandle handle = YooAssets.LoadAssetAsync<Sprite>("Icon_Leafs_128");
 				_cachedAssetOperationHandles.Add(handle);
 				handle.Completed += OnUnityAtlas_Completed;
 			});
@ -163,7 +163,7 @@ public class Game1Scene : MonoBehaviour
 			var btn = CanvasRoot.transform.Find("load_tp_atlas/btn").GetComponent<Button>();
 			btn.onClick.AddListener(() =>
 			{
-				SubAssetsOperationHandle handle = YooAssets.LoadSubAssetsAsync<Sprite>("TpAtlas/tpAtlas");
+				SubAssetsOperationHandle handle = YooAssets.LoadSubAssetsAsync<Sprite>("tpAtlas");
 				_cachedSubAssetsOperationHandles.Add(handle);
 				handle.Completed += OnTpAtlasAsset_Completed;
 			});
@ -175,7 +175,7 @@ public class Game1Scene : MonoBehaviour
 			btn.onClick.AddListener(() =>
 			{
 				string savePath = $"{YooAssets.GetSandboxRoot()}/config1.txt";
-				RawFileOperation operation = YooAssets.GetRawFileAsync("Config/config1.txt", savePath);
+				RawFileOperation operation = YooAssets.GetRawFileAsync("config1", savePath);
 				operation.Completed += OnRawFile_Completed;
 			});
 		}
@ -185,7 +185,7 @@ public class Game1Scene : MonoBehaviour
 			var btn = CanvasRoot.transform.Find("load_scene").GetComponent<Button>();
 			btn.onClick.AddListener(() =>
 			{
-				YooAssets.LoadSceneAsync("Scene/Game2.unity");
+				YooAssets.LoadSceneAsync("Game2");
 			});
 		}
 	}
@ -215,7 +215,7 @@ public class Game1Scene : MonoBehaviour
 		// 加载背景音乐
 		{
 			var audioSource = CanvasRoot.transform.Find("music").GetComponent<AudioSource>();
-			AssetOperationHandle handle = YooAssets.LoadAssetAsync<AudioClip>("Music/town");
+			AssetOperationHandle handle = YooAssets.LoadAssetAsync<AudioClip>("town");
 			_cachedAssetOperationHandles.Add(handle);
 			await handle.Task;
 			audioSource.clip = handle.AssetObject as AudioClip;
--- a/Sample/GameScript/Runtime/Game2Scene.cs
+++ b/Sample/GameScript/Runtime/Game2Scene.cs
@ -41,7 +41,7 @@ public class Game2Scene : MonoBehaviour
 #if UNITY_WEBGL
 		{
 			var rawImage = CanvasRoot.transform.Find("background").GetComponent<RawImage>();
-			AssetOperationHandle handle = YooAssets.LoadAssetAsync<Texture>("Texture/bg");
+			AssetOperationHandle handle = YooAssets.LoadAssetAsync<Texture>("bg");
 			_cachedAssetOperationHandles.Add(handle);
 			handle.Completed += (AssetOperationHandle obj) =>
 			{
@ -51,7 +51,7 @@ public class Game2Scene : MonoBehaviour
 #else
 		{
 			var rawImage = CanvasRoot.transform.Find("background").GetComponent<RawImage>();
-			AssetOperationHandle handle = YooAssets.LoadAssetSync<Texture>("Texture/bg");
+			AssetOperationHandle handle = YooAssets.LoadAssetSync<Texture>("bg");
 			_cachedAssetOperationHandles.Add(handle);
 			rawImage.texture = handle.AssetObject as Texture;
 		}
@ -62,7 +62,7 @@ public class Game2Scene : MonoBehaviour
 			var btn = CanvasRoot.transform.Find("load_scene").GetComponent<Button>();
 			btn.onClick.AddListener(() =>
 			{
-				YooAssets.LoadSceneAsync("Scene/Game1");
+				YooAssets.LoadSceneAsync("Game1");
 			});
 		}

@ -71,7 +71,7 @@ public class Game2Scene : MonoBehaviour
 			var btn = CanvasRoot.transform.Find("subSceneLoadBtn").GetComponent<Button>();
 			btn.onClick.AddListener(() =>
 			{
-				var subSceneHandle = YooAssets.LoadSceneAsync("Scene/SubScene", UnityEngine.SceneManagement.LoadSceneMode.Additive);
+				var subSceneHandle = YooAssets.LoadSceneAsync("SubScene", UnityEngine.SceneManagement.LoadSceneMode.Additive);
 				_subSceneHandles.Add(subSceneHandle);
 			});
 		}
@ -98,7 +98,7 @@ public class Game2Scene : MonoBehaviour
 		// 加载背景音乐
 		{
 			var audioSource = CanvasRoot.transform.Find("music").GetComponent<AudioSource>();
-			AssetOperationHandle handle = YooAssets.LoadAssetAsync<AudioClip>("Music/town");
+			AssetOperationHandle handle = YooAssets.LoadAssetAsync<AudioClip>("town");
 			_cachedAssetOperationHandles.Add(handle);
 			yield return handle;
 			audioSource.clip = handle.AssetObject as AudioClip;
--- a/Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmPatchDone.cs
+++ b/Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmPatchDone.cs
@ -11,7 +11,7 @@ internal class FsmPatchDone : IFsmNode
 		PatchEventDispatcher.SendPatchStepsChangeMsg(EPatchStates.PatchDone);
 		Debug.Log("补丁流程更新完毕！");

-		YooAsset.YooAssets.LoadSceneAsync("Scene/Game1");
+		YooAsset.YooAssets.LoadSceneAsync("Game1");
 	}
 	void IFsmNode.OnUpdate()
 	{
--- a/Sample/YooAssetSetting/AssetBundleBuilderSetting.asset
+++ b/Sample/YooAssetSetting/AssetBundleBuilderSetting.asset
@ -13,9 +13,9 @@ MonoBehaviour:
  m_Name: AssetBundleBuilderSetting
  m_EditorClassIdentifier: 
  BuildVersion: 100
-  BuildPipeline: 1
+  BuildPipeline: 0
  BuildMode: 0
  BuildTags: buildin;
  CompressOption: 2
+  OutputNameStyle: 1
  EncyptionClassName: EncryptionNone
-  AppendExtension: 0
--- a/Sample/YooAssetSetting/AssetBundleCollectorConfig.xml
+++ b/Sample/YooAssetSetting/AssetBundleCollectorConfig.xml
@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root Version="1.0">
-  <Common AutoAddressable="False" AutoCollectShader="True" ShaderBundleName="myshaders" />
+  <Common AutoAddressable="True" />
  <Group GroupName="Level" GroupDesc="关卡资源" AssetTags="level">
-    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/Entity/Level1" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackSeparately" FilterRule="CollectPrefab" AssetTags="level1" />
-    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/Entity/Level2" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackSeparately" FilterRule="CollectPrefab" AssetTags="level2" />
+    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/Entity/Level1" CollectGUID="724066efe61192e43a0d7e59166b36a4" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackSeparately" FilterRule="CollectPrefab" AssetTags="level1" />
+    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/Entity/Level2" CollectGUID="8045c1986f0ae964f8b1ea29e3522388" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackSeparately" FilterRule="CollectPrefab" AssetTags="level2" />
  </Group>
  <Group GroupName="Buildin" GroupDesc="首包资源" AssetTags="buildin">
-    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/Scene" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackSeparately" FilterRule="CollectScene" AssetTags="" />
-    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/Config" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackRawFile" FilterRule="CollectAll" AssetTags="" />
-    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/Music" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackDirectory" FilterRule="CollectAll" AssetTags="" />
+    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/Scene" CollectGUID="f75e7d64104fb1a48b849b72b84ade4c" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackSeparately" FilterRule="CollectScene" AssetTags="" />
+    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/Config" CollectGUID="44774abdee2b91b45b42f9dadf8c17a4" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackRawFile" FilterRule="CollectAll" AssetTags="" />
+    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/Music" CollectGUID="e05b02ee4d90ae84a99871ce75288ea2" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackDirectory" FilterRule="CollectAll" AssetTags="" />
  </Group>
  <Group GroupName="Panel" GroupDesc="面板资源" AssetTags="panel">
-    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/Texture" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackCollector" FilterRule="CollectAll" AssetTags="" />
-    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/TpAtlas" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackDirectory" FilterRule="CollectAll" AssetTags="" />
-    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/UIPanel" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackDirectory" FilterRule="CollectAll" AssetTags="" />
-    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/UISprite" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackDirectory" FilterRule="CollectAll" AssetTags="" />
+    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/Texture" CollectGUID="69b046f60ca75f647b2963e0113fd779" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackCollector" FilterRule="CollectAll" AssetTags="" />
+    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/TpAtlas" CollectGUID="06e38aac2570d2b4a97c6a90223e5344" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackDirectory" FilterRule="CollectAll" AssetTags="" />
+    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/UIPanel" CollectGUID="926d3203fcefdb947881a7491496e039" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackDirectory" FilterRule="CollectAll" AssetTags="" />
+    <Collector CollectPath="Assets/Samples/Basic Sample/GameRes/UISprite" CollectGUID="29f27e4abf667c04b88a3996d8cdadfc" CollectType="MainAssetCollector" AddressRule="AddressByFileName" PackRule="PackDirectory" FilterRule="CollectAll" AssetTags="" />
  </Group>
  <Group GroupName="Art" GroupDesc="美术资源" AssetTags="">
-    <Collector CollectPath="Assets/Samples/Basic Sample/GameArt/ShaderVariants" CollectType="StaticAssetCollector" AddressRule="AddressByFileName" PackRule="PackShaderVariants" FilterRule="CollectAll" AssetTags="" />
-    <Collector CollectPath="Assets/Samples/Basic Sample/GameArt/UIFont" CollectType="DependAssetCollector" AddressRule="AddressByFileName" PackRule="PackDirectory" FilterRule="CollectAll" AssetTags="" />
+    <Collector CollectPath="Assets/Samples/Basic Sample/GameArt/ShaderVariants" CollectGUID="00781758c26692e40a9634ddeac838be" CollectType="StaticAssetCollector" AddressRule="AddressByFileName" PackRule="PackShaderVariants" FilterRule="CollectAll" AssetTags="" />
+    <Collector CollectPath="Assets/Samples/Basic Sample/GameArt/UIFont" CollectGUID="464727a15e4a7dc4d895346374432399" CollectType="DependAssetCollector" AddressRule="AddressByFileName" PackRule="PackDirectory" FilterRule="CollectAll" AssetTags="" />
  </Group>
 </root>
--- a/Sample/YooAssetSetting/AssetBundleCollectorSetting.asset
+++ b/Sample/YooAssetSetting/AssetBundleCollectorSetting.asset
@ -12,9 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 185f6993d5150494d98da50e26cb1c25, type: 3}
  m_Name: AssetBundleCollectorSetting
  m_EditorClassIdentifier: 
-  EnableAddressable: 0
-  AutoCollectShaders: 1
-  ShadersBundleName: myshaders
+  EnableAddressable: 1
  Groups:
  - GroupName: Level
    GroupDesc: "\u5173\u5361\u8D44\u6E90"
@ -22,12 +20,14 @@ MonoBehaviour:
    ActiveRuleName: EnableGroup
    Collectors:
    - CollectPath: Assets/Samples/Basic Sample/GameRes/Entity/Level1
+      CollectorGUID: 724066efe61192e43a0d7e59166b36a4
      CollectorType: 0
      AddressRuleName: AddressByFileName
      PackRuleName: PackSeparately
      FilterRuleName: CollectPrefab
      AssetTags: level1
    - CollectPath: Assets/Samples/Basic Sample/GameRes/Entity/Level2
+      CollectorGUID: 8045c1986f0ae964f8b1ea29e3522388
      CollectorType: 0
      AddressRuleName: AddressByFileName
      PackRuleName: PackSeparately
@ -39,18 +39,21 @@ MonoBehaviour:
    ActiveRuleName: EnableGroup
    Collectors:
    - CollectPath: Assets/Samples/Basic Sample/GameRes/Scene
+      CollectorGUID: f75e7d64104fb1a48b849b72b84ade4c
      CollectorType: 0
      AddressRuleName: AddressByFileName
      PackRuleName: PackSeparately
      FilterRuleName: CollectScene
      AssetTags: 
    - CollectPath: Assets/Samples/Basic Sample/GameRes/Config
+      CollectorGUID: 44774abdee2b91b45b42f9dadf8c17a4
      CollectorType: 0
      AddressRuleName: AddressByFileName
      PackRuleName: PackRawFile
      FilterRuleName: CollectAll
      AssetTags: 
    - CollectPath: Assets/Samples/Basic Sample/GameRes/Music
+      CollectorGUID: e05b02ee4d90ae84a99871ce75288ea2
      CollectorType: 0
      AddressRuleName: AddressByFileName
      PackRuleName: PackDirectory
@ -62,24 +65,28 @@ MonoBehaviour:
    ActiveRuleName: EnableGroup
    Collectors:
    - CollectPath: Assets/Samples/Basic Sample/GameRes/Texture
+      CollectorGUID: 69b046f60ca75f647b2963e0113fd779
      CollectorType: 0
      AddressRuleName: AddressByFileName
      PackRuleName: PackCollector
      FilterRuleName: CollectAll
      AssetTags: 
    - CollectPath: Assets/Samples/Basic Sample/GameRes/TpAtlas
+      CollectorGUID: 06e38aac2570d2b4a97c6a90223e5344
      CollectorType: 0
      AddressRuleName: AddressByFileName
      PackRuleName: PackDirectory
      FilterRuleName: CollectAll
      AssetTags: 
    - CollectPath: Assets/Samples/Basic Sample/GameRes/UIPanel
+      CollectorGUID: 926d3203fcefdb947881a7491496e039
      CollectorType: 0
      AddressRuleName: AddressByFileName
      PackRuleName: PackDirectory
      FilterRuleName: CollectAll
      AssetTags: 
    - CollectPath: Assets/Samples/Basic Sample/GameRes/UISprite
+      CollectorGUID: 29f27e4abf667c04b88a3996d8cdadfc
      CollectorType: 0
      AddressRuleName: AddressByFileName
      PackRuleName: PackDirectory
@ -91,12 +98,14 @@ MonoBehaviour:
    ActiveRuleName: EnableGroup
    Collectors:
    - CollectPath: Assets/Samples/Basic Sample/GameArt/ShaderVariants
+      CollectorGUID: 00781758c26692e40a9634ddeac838be
      CollectorType: 1
      AddressRuleName: AddressByFileName
      PackRuleName: PackShaderVariants
      FilterRuleName: CollectAll
      AssetTags: 
    - CollectPath: Assets/Samples/Basic Sample/GameArt/UIFont
+      CollectorGUID: 464727a15e4a7dc4d895346374432399
      CollectorType: 2
      AddressRuleName: AddressByFileName
      PackRuleName: PackDirectory