LiRuochen_WorkFlow/YooAssetScene
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 32 Wiki Activity

Update Basic Samples

Browse Source
This commit is contained in:
hevinci
2022-09-22 11:42:13 +08:00
parent 8cec0abf0e
commit ca83a4450d
7 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/BootScene.cs
+3 -3
View File
@@ -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();
Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/Game1Scene.cs
+15 -15
View File
@@ -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;
Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/Game2Scene.cs
+5 -5
View File
@@ -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;
Assets/YooAsset/Samples~/Basic Sample/GameScript/Runtime/PatchUpdater/FsmNode/FsmPatchDone.cs
+1 -1
View File
@@ -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()
{