From 188e999e9376d67a6bde1ce38d4ab387d98ccba8 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 20 五月 2019 15:34:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into HazyRegion_1
---
Core/ResModule/VideoLoader.cs | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/Core/ResModule/VideoLoader.cs b/Core/ResModule/VideoLoader.cs
index 7a2668f..8989c7a 100644
--- a/Core/ResModule/VideoLoader.cs
+++ b/Core/ResModule/VideoLoader.cs
@@ -8,7 +8,18 @@
public static VideoClip Load(string name)
{
- return Resources.Load<VideoClip>(name);
+#if UNITY_EDITOR
+ if (Application.isEditor)
+ {
+ return UnityEditor.AssetDatabase.LoadAssetAtPath<VideoClip>(string.Format("Assets/Editor/Video/{0}.mp4", name));
+ }
+#endif
+
+#if UNITY_STANDALONE && !UNITY_EDITOR
+ return Resources.Load<VideoClip>(name);
+#endif
+
+ return null;
}
}
--
Gitblit v1.8.0