From cf8f15163718b8412490ea3f38a1b625a68b5087 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 08 五月 2019 14:08:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/ResModule/VideoLoader.cs | 28 ++--------------------------
1 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/Core/ResModule/VideoLoader.cs b/Core/ResModule/VideoLoader.cs
index 1c9b37b..50e4c38 100644
--- a/Core/ResModule/VideoLoader.cs
+++ b/Core/ResModule/VideoLoader.cs
@@ -12,7 +12,7 @@
if (Application.isEditor)
{
#if UNITY_EDITOR
- var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath, "Movie/", name, ".mp4");
+ var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath, "Video/", name, ".mp4");
mp4 = UnityEditor.AssetDatabase.LoadAssetAtPath<VideoClip>(path);
if (mp4 == null)
{
@@ -22,35 +22,11 @@
}
else
{
- var assetInfo = new AssetInfo("movie", name);
+ var assetInfo = new AssetInfo("video", name);
mp4 = AssetBundleUtility.Instance.Sync_LoadAsset(assetInfo) as VideoClip;
}
return mp4;
- }
-
- public static GameObject LoadPlayer()
- {
- GameObject prefab = null;
- if (Application.isEditor)
- {
-#if UNITY_EDITOR
- var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath, "Movie/MoviePlayer.prefab");
- prefab = UnityEditor.AssetDatabase.LoadAssetAtPath<GameObject>(path);
-#endif
- }
- else
- {
- var assetInfo = new AssetInfo("movie", "MoviePlayer");
- prefab = AssetBundleUtility.Instance.Sync_LoadAsset(assetInfo) as GameObject;
- }
-
- if (prefab == null)
- {
- DebugEx.LogError("VideoLoader.LoadPlayer() => 鍔犺浇涓嶅埌璧勬簮: MoviePlayer.");
- }
-
- return prefab;
}
}
--
Gitblit v1.8.0