From 7c1e1ab5936f4d828c9d0cf8bf88a0b680863568 Mon Sep 17 00:00:00 2001
From: hevinci <hevinci@hotmail.com>
Date: Thu, 22 Sep 2022 14:29:24 +0800
Subject: [PATCH] Update Basic Sample

---
 .../GameRes/Music/{town.wav => music_town.wav}    | Bin
 .../Music/{town.wav.meta => music_town.wav.meta}  |   0
 .../Scene/{Game1.unity => GameScene1.unity}       |   0
 .../{Game1.unity.meta => GameScene1.unity.meta}   |   0
 .../Scene/{Game2.unity => GameScene2.unity}       |   0
 .../{Game2.unity.meta => GameScene2.unity.meta}   |   0
 .../GameRes/Texture/{bg.png => tex_bg.png}        | Bin
 .../Texture/{bg.png.meta => tex_bg.png.meta}      |   0
 .../GameRes/Texture/{logo.png => tex_logo.png}    | Bin
 .../Texture/{logo.png.meta => tex_logo.png.meta}  |   0
 .../UIPanel/{window.prefab => ui_window.prefab}   |   0
 .../{window.prefab.meta => ui_window.prefab.meta} |   0
 .../UIPanel/{window2.prefab => ui_window2.prefab} |   0
 ...window2.prefab.meta => ui_window2.prefab.meta} |   0
 .../Runtime/{Game1Scene.cs => GameScene1.cs}      |  14 +++++++-------
 .../{Game1Scene.cs.meta => GameScene1.cs.meta}    |   0
 .../Runtime/{Game2Scene.cs => GameScene2.cs}      |  10 +++++-----
 .../{Game2Scene.cs.meta => GameScene2.cs.meta}    |   0
 .../Runtime/PatchUpdater/FsmNode/FsmPatchDone.cs  |   2 +-
 19 files changed, 13 insertions(+), 13 deletions(-)
 rename Assets/YooAsset/Samples~/Basic Sample/GameRes/Music/{town.wav => music_town.wav} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameRes/Music/{town.wav.meta => music_town.wav.meta} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/{Game1.unity => GameScene1.unity} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/{Game1.unity.meta => GameScene1.unity.meta} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/{Game2.unity => GameScene2.unity} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/{Game2.unity.meta => GameScene2.unity.meta} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/{bg.png => tex_bg.png} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/{bg.png.meta => tex_bg.png.meta} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/{logo.png => tex_logo.png} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/{logo.png.meta => tex_logo.png.meta} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/{window.prefab => ui_window.prefab} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/{window.prefab.meta => ui_window.prefab.meta} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/{window2.prefab => ui_window2.prefab} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/{window2.prefab.meta => ui_window2.prefab.meta} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/{Game1Scene.cs => GameScene1.cs} (97%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/{Game1Scene.cs.meta => GameScene1.cs.meta} (100%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/{Game2Scene.cs => GameScene2.cs} (95%)
 rename Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/{Game2Scene.cs.meta => GameScene2.cs.meta} (100%)

diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/Music/town.wav b/Assets/YooAsset/Samples~/Basic Sample/GameRes/Music/music_town.wav
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameRes/Music/town.wav
rename to Assets/YooAsset/Samples~/Basic Sample/GameRes/Music/music_town.wav
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/Music/town.wav.meta b/Assets/YooAsset/Samples~/Basic Sample/GameRes/Music/music_town.wav.meta
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameRes/Music/town.wav.meta
rename to Assets/YooAsset/Samples~/Basic Sample/GameRes/Music/music_town.wav.meta
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/Game1.unity b/Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/GameScene1.unity
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/Game1.unity
rename to Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/GameScene1.unity
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/Game1.unity.meta b/Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/GameScene1.unity.meta
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/Game1.unity.meta
rename to Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/GameScene1.unity.meta
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/Game2.unity b/Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/GameScene2.unity
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/Game2.unity
rename to Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/GameScene2.unity
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/Game2.unity.meta b/Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/GameScene2.unity.meta
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/Game2.unity.meta
rename to Assets/YooAsset/Samples~/Basic Sample/GameRes/Scene/GameScene2.unity.meta
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/bg.png b/Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/tex_bg.png
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/bg.png
rename to Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/tex_bg.png
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/bg.png.meta b/Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/tex_bg.png.meta
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/bg.png.meta
rename to Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/tex_bg.png.meta
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/logo.png b/Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/tex_logo.png
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/logo.png
rename to Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/tex_logo.png
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/logo.png.meta b/Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/tex_logo.png.meta
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/logo.png.meta
rename to Assets/YooAsset/Samples~/Basic Sample/GameRes/Texture/tex_logo.png.meta
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/window.prefab b/Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/ui_window.prefab
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/window.prefab
rename to Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/ui_window.prefab
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/window.prefab.meta b/Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/ui_window.prefab.meta
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/window.prefab.meta
rename to Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/ui_window.prefab.meta
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/window2.prefab b/Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/ui_window2.prefab
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/window2.prefab
rename to Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/ui_window2.prefab
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/window2.prefab.meta b/Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/ui_window2.prefab.meta
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/window2.prefab.meta
rename to Assets/YooAsset/Samples~/Basic Sample/GameRes/UIPanel/ui_window2.prefab.meta
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/Game1Scene.cs b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/GameScene1.cs
similarity index 97%
rename from Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/Game1Scene.cs
rename to Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/GameScene1.cs
index 4a4346f..dd434d1 100644
--- a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/Game1Scene.cs	
+++ b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/GameScene1.cs	
@@ -6,7 +6,7 @@ using UnityEngine.U2D;
 using UnityEngine.UI;
 using YooAsset;
 
-public class Game1Scene : MonoBehaviour
+public class GameScene1 : MonoBehaviour
 {
 	public GameObject CanvasRoot;
 
@@ -72,7 +72,7 @@ public class Game1Scene : MonoBehaviour
 #if UNITY_WEBGL
 		{
 			var rawImage = CanvasRoot.transform.Find("background").GetComponent<RawImage>();
-			AssetOperationHandle handle = YooAssets.LoadAssetAsync<Texture>("bg");
+			AssetOperationHandle handle = YooAssets.LoadAssetAsync<Texture>("tex_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>("bg");
+			AssetOperationHandle handle = YooAssets.LoadAssetSync<Texture>("tex_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>("logo");
+			AssetOperationHandle handle = YooAssets.LoadAssetAsync<Sprite>("tex_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>("logo");
+			AssetOperationHandle handle = YooAssets.LoadAssetSync<Sprite>("tex_logo");
 			_cachedAssetOperationHandles.Add(handle);
 			logoImage.sprite = handle.AssetObject as Sprite;
 		}
@@ -185,7 +185,7 @@ public class Game1Scene : MonoBehaviour
 			var btn = CanvasRoot.transform.Find("load_scene").GetComponent<Button>();
 			btn.onClick.AddListener(() =>
 			{
-				YooAssets.LoadSceneAsync("Game2");
+				YooAssets.LoadSceneAsync("GameScene2");
 			});
 		}
 	}
@@ -215,7 +215,7 @@ public class Game1Scene : MonoBehaviour
 		// 加载背景音乐
 		{
 			var audioSource = CanvasRoot.transform.Find("music").GetComponent<AudioSource>();
-			AssetOperationHandle handle = YooAssets.LoadAssetAsync<AudioClip>("town");
+			AssetOperationHandle handle = YooAssets.LoadAssetAsync<AudioClip>("music_town");
 			_cachedAssetOperationHandles.Add(handle);
 			await handle.Task;
 			audioSource.clip = handle.AssetObject as AudioClip;
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/Game1Scene.cs.meta b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/GameScene1.cs.meta
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/Game1Scene.cs.meta
rename to Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/GameScene1.cs.meta
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/Game2Scene.cs b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/GameScene2.cs
similarity index 95%
rename from Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/Game2Scene.cs
rename to Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/GameScene2.cs
index bac2308..3e81819 100644
--- a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/Game2Scene.cs	
+++ b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/GameScene2.cs	
@@ -6,7 +6,7 @@ using UnityEngine.U2D;
 using UnityEngine.UI;
 using YooAsset;
 
-public class Game2Scene : MonoBehaviour
+public class GameScene2 : MonoBehaviour
 {
 	public GameObject CanvasRoot;
 	private readonly List<AssetOperationHandle> _cachedAssetOperationHandles = new List<AssetOperationHandle>(1000);
@@ -41,7 +41,7 @@ public class Game2Scene : MonoBehaviour
 #if UNITY_WEBGL
 		{
 			var rawImage = CanvasRoot.transform.Find("background").GetComponent<RawImage>();
-			AssetOperationHandle handle = YooAssets.LoadAssetAsync<Texture>("bg");
+			AssetOperationHandle handle = YooAssets.LoadAssetAsync<Texture>("tex_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>("bg");
+			AssetOperationHandle handle = YooAssets.LoadAssetSync<Texture>("tex_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("Game1");
+				YooAssets.LoadSceneAsync("GameScene1");
 			});
 		}
 
@@ -98,7 +98,7 @@ public class Game2Scene : MonoBehaviour
 		// 加载背景音乐
 		{
 			var audioSource = CanvasRoot.transform.Find("music").GetComponent<AudioSource>();
-			AssetOperationHandle handle = YooAssets.LoadAssetAsync<AudioClip>("town");
+			AssetOperationHandle handle = YooAssets.LoadAssetAsync<AudioClip>("music_town");
 			_cachedAssetOperationHandles.Add(handle);
 			yield return handle;
 			audioSource.clip = handle.AssetObject as AudioClip;
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/Game2Scene.cs.meta b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/GameScene2.cs.meta
similarity index 100%
rename from Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/Game2Scene.cs.meta
rename to Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/GameScene2.cs.meta
diff --git a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmPatchDone.cs b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmPatchDone.cs
index 6061bac..70926ae 100644
--- a/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmPatchDone.cs	
+++ b/Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmPatchDone.cs	
@@ -11,7 +11,7 @@ internal class FsmPatchDone : IFsmNode
 		PatchEventDispatcher.SendPatchStepsChangeMsg(EPatchStates.PatchDone);
 		Debug.Log("补丁流程更新完毕！");
 
-		YooAsset.YooAssets.LoadSceneAsync("Game1");
+		YooAsset.YooAssets.LoadSceneAsync("GameScene1");
 	}
 	void IFsmNode.OnUpdate()
 	{