Merge branch 'master' into ILRuntime

DESKTOP-UBV38B7\codingworks · DESKTOP-UBV38B7\codingworks · commit e6d8c1bc9cd9 · 2018-06-25T17:22:44.000+08:00
diff --git a/Assets/Game/Scripts/Resource/EditorResourceHelper.cs b/Assets/Game/Scripts/Resource/EditorResourceHelper.cs
@@ -35,6 +35,30 @@ public T LoadAsset<T>(string assetName) where T : Object
             return AssetDatabase.LoadAssetAtPath<T>(assetName);
         }
 
+
+        /// <summary>
+        /// 异步加载资源
+        /// </summary>
+        /// <param name="assetName">资源名称</param>
+        public AssetBundleRequest LoadAssetAsync<T>(string assetName) where T : Object
+        {
+            //assetName = assetName.ToLower();
+            //AssetBundle assetBundle;
+            //if (_allAssets.TryGetValue(assetName, out assetBundle))
+            //{
+            //    //加载相关依赖
+            //    string[] dependencies = _mainfest.GetAllDependencies(assetName);
+            //    foreach (var item in dependencies)
+            //    {
+            //        AssetBundle.LoadFromFile(_readPath + "/" + item);
+            //    }
+            //    AssetBundleRequest requetAsset = assetBundle.LoadAssetAsync<T>(assetName);
+            //    //	_allObjects.Add(assetName, asset);
+            //    return requetAsset;
+            //}
+            return null;
+        }
+
         /// <summary>
         /// 异步加载场景
         /// </summary>
@@ -48,9 +72,9 @@ public AsyncOperation LoadSceneAsync(string sceneName, LoadSceneMode mode = Load
         /// 卸载场景
         /// </summary>
         /// <param name="sceneName"></param>
-        public void UnloadScene(string sceneName)
+        public AsyncOperation UnloadSceneAsync(string sceneName)
         {
-            UnitySceneManager.UnloadScene(sceneName);
+            return UnitySceneManager.UnloadSceneAsync(sceneName);
         }
 
         /// <summary>
diff --git a/Assets/GameFramework/Resource/BundleResourceHelper .cs b/Assets/GameFramework/Resource/BundleResourceHelper .cs
@@ -86,6 +86,30 @@ public T LoadAsset<T>(string assetName) where T : Object
 			return null;
 		}
 
+        /// <summary>
+        /// 异步加载资源
+        /// </summary>
+        /// <param name="assetName">资源名称</param>
+	    public AssetBundleRequest LoadAssetAsync<T>(string assetName) where T : Object
+        {
+	        assetName = assetName.ToLower();
+	        AssetBundle assetBundle;
+	        if (_allAssets.TryGetValue(assetName, out assetBundle))
+	        {
+	            //加载相关依赖
+	            string[] dependencies = _mainfest.GetAllDependencies(assetName);
+	            foreach (var item in dependencies)
+	            {
+	                AssetBundle.LoadFromFile(_readPath + "/" + item);
+	            }
+	            AssetBundleRequest requetAsset = assetBundle.LoadAssetAsync<T>(assetName);
+	            //	_allObjects.Add(assetName, asset);
+	            return requetAsset;
+	        }
+	        return null;
+        }
+
+
 		/// <summary>
 		/// 异步加载场景
 		/// </summary>
@@ -110,9 +134,9 @@ public AsyncOperation LoadSceneAsync(string sceneName, LoadSceneMode mode = Load
 		/// 卸载场景
 		/// </summary>
 		/// <param name="sceneName"></param>
-		public void UnloadScene(string sceneName)
+		public AsyncOperation UnloadSceneAsync(string sceneName)
 		{
-			UnityEngine.SceneManagement.SceneManager.UnloadScene(sceneName);
+			return UnityEngine.SceneManagement.SceneManager.UnloadSceneAsync(sceneName);
 		}
 
 
@@ -130,9 +154,7 @@ public void Clear()
 		}
 
 		#endregion
-
-
-
+        
 		#region 内部函数
 		/// <summary>
 		/// 加载mainfest
diff --git a/Assets/GameFramework/Resource/IResourceHelper.cs b/Assets/GameFramework/Resource/IResourceHelper.cs
@@ -28,6 +28,12 @@ public interface IResourceHelper
         /// <returns></returns>
         T LoadAsset<T>(string assetName) where T : UnityEngine.Object;
 
+        /// <summary>
+        /// 异步加载资源
+        /// </summary>
+        /// <param name="assetName"></param>
+        AssetBundleRequest LoadAssetAsync<T>(string assetName) where T : UnityEngine.Object;
+
         /// <summary>
         /// 异步加载场景
         /// </summary>
@@ -38,7 +44,7 @@ public interface IResourceHelper
         /// 卸载场景
         /// </summary>
         /// <param name="sceneName"></param>
-        void UnloadScene(string sceneName);
+        AsyncOperation UnloadSceneAsync(string sceneName);
 
         /// <summary>
         /// 清理资源
diff --git a/Assets/GameFramework/Resource/ResourceManager.cs b/Assets/GameFramework/Resource/ResourceManager.cs
@@ -7,29 +7,47 @@
 // <time> #2018年6月22日 17点11分# </time>
 //-----------------------------------------------------------------------
 
+using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnitySceneManager = UnityEngine.SceneManagement.SceneManager;
 using LoadSceneMode = UnityEngine.SceneManagement.LoadSceneMode;
 
 namespace GameFramework.Taurus
 {
-    public sealed class ResourceManager:GameFrameworkModule
+    public sealed class ResourceManager:GameFrameworkModule,IUpdate
     {
-		#region 属性
+        #region 属性
+
+        //事件触发类
+        private EventManager _event;
 		//资源管理器 帮助类
 		private IResourceHelper _resourceHelper;
-
 		//GameObject对象池管理器
 		private IGameObjectPoolHelper _gameObjectPoolHelper;
 
+
+        //场景加载中事件
+        private SceneLoadingEventArgs _sceneLoadingEventArgs;
+        //场景加载完毕事件
+        private SceneLoadedEventArgs _sceneLoadedEventArgs;
+        //场景异步加载
+        private Dictionary<string, AsyncOperation> _sceneAsyncOperations;
+
 		#endregion
 
 		#region 构造函数
 		public ResourceManager()
 		{
-			//添加对象池管理器
-			_gameObjectPoolHelper = new GameObject("GameObject_Pool").AddComponent<GameObjectPoolHelper>();
+            //获取事件管理器
+		    _event = GameFrameworkMode.GetModule<EventManager>();
+            //添加对象池管理器
+            _gameObjectPoolHelper = new GameObject("GameObject_Pool").AddComponent<GameObjectPoolHelper>();
+
+            //场景事件
+		    _sceneLoadingEventArgs = new SceneLoadingEventArgs();
+		    _sceneLoadedEventArgs = new SceneLoadedEventArgs();
+		    _sceneAsyncOperations = new Dictionary<string, AsyncOperation>();
 		}
 		#endregion
 
@@ -70,6 +88,8 @@ public T LoadAsset<T>(string assetName) where T : UnityEngine.Object
 			return _resourceHelper.LoadAsset<T>(assetName);
 		}
 
+
+
 		/// <summary>
 		/// 异步加载场景
 		/// </summary>
@@ -78,17 +98,23 @@ public AsyncOperation LoadSceneAsync(string sceneName, LoadSceneMode mode = Load
 		{
 			if (_resourceHelper == null)
 				return null;
+		    AsyncOperation asyncOperation= _resourceHelper.LoadSceneAsync(sceneName, mode);
+		    _sceneAsyncOperations.Add(sceneName, asyncOperation);
+		    return asyncOperation;
 
-			return _resourceHelper.LoadSceneAsync(sceneName, mode);
 		}
 
 		/// <summary>
 		/// 卸载场景
 		/// </summary>
 		/// <param name="sceneName"></param>
-		public void UnloadScene(string sceneName)
+		public void UnloadSceneAsync(string sceneName)
 		{
-			UnitySceneManager.UnloadScene(sceneName);
+		    if (_resourceHelper == null)
+		        return;
+
+		     _resourceHelper.UnloadSceneAsync(sceneName);
+		    return;
 		}
 
 		/// <summary>
@@ -166,11 +192,36 @@ public void DespawnPrefab(string assetName)
 		}
 
 		#endregion
+        
 
+		#region 重写函数
 
+        public void OnUpdate()
+        {
+            if (_sceneAsyncOperations.Count > 0)
+            {
+                foreach (var item in _sceneAsyncOperations)
+                {
+                    //触发加载完毕事件
+                    if (item.Value.isDone)
+                    {
+                        _sceneLoadedEventArgs.SceneName = item.Key;
+                        _event.Trigger(this, _sceneLoadedEventArgs);
+                        _sceneAsyncOperations.Remove(item.Key);
+                        break;
+                    }
+                    //触发正在加载事件
+                    else
+                    {
+                        _sceneLoadingEventArgs.SceneName = item.Key;
+                        _sceneLoadingEventArgs.Progress = item.Value.progress;
+                        _event.Trigger(this, _sceneLoadingEventArgs);
+                    }
+                }
+            }
+        }
 
-		#region 重写函数
-		public override void OnClose()
+        public override void OnClose()
 		{
 			if (_resourceHelper != null)
 				_resourceHelper.Clear();
diff --git a/Assets/GameFramework/Resource/SceneEventArgs.cs b/Assets/GameFramework/Resource/SceneEventArgs.cs
@@ -0,0 +1,38 @@
+﻿//-----------------------------------------------------------------------
+// <copyright>
+//     Copyright (c) 2018 Zhang Yang. All rights reserved.
+// </copyright>
+// <describe> #场景事件加载类# </describe>
+// <email> yeozhang@qq.com </email>
+// <time> #2018年6月25日 16点43分# </time>
+//-----------------------------------------------------------------------
+
+namespace GameFramework.Taurus
+{
+    /// <summary>
+    /// 场景加载中事件
+    /// </summary>
+    public class SceneLoadingEventArgs : GameEventArgs<SceneLoadingEventArgs>
+    {
+        /// <summary>
+        /// 场景名称
+        /// </summary>
+        public string SceneName;
+        /// <summary>
+        /// 场景加载进度
+        /// </summary>
+        public float Progress;
+    }
+
+    /// <summary>
+    /// 场景加载完成事件
+    /// </summary>
+    public class SceneLoadedEventArgs : GameEventArgs<SceneLoadedEventArgs>
+    {
+        /// <summary>
+        /// 场景名称
+        /// </summary>
+        public string SceneName;
+    }
+
+}
diff --git a/Assets/GameFramework/Resource/SceneEventArgs.cs.meta b/Assets/GameFramework/Resource/SceneEventArgs.cs.meta
