Merge pull request #38 from EllanJiang/v2019.2

V2019.2

Author: Ellan Jiang

GameFramework/Base/TaskPool/TaskPool.cs

@@ -18,6 +18,7 @@ internal sealed class TaskPool<T> where T : ITask
  private readonly Stack<ITaskAgent<T>> m_FreeAgents;
  private readonly LinkedList<ITaskAgent<T>> m_WorkingAgents;
  private readonly LinkedList<T> m_WaitingTasks;
+ private bool m_Paused;
 
  /// <summary>
  /// 初始化任务池的新实例。
@@ -27,6 +28,22 @@ public TaskPool()
  m_FreeAgents = new Stack<ITaskAgent<T>>();
  m_WorkingAgents = new LinkedList<ITaskAgent<T>>();
  m_WaitingTasks = new LinkedList<T>();
+ m_Paused = false;
+ }
+
+ /// <summary>
+ /// 获取或设置任务池是否被暂停。
+ /// </summary>
+ public bool Paused
+ {
+ get
+ {
+ return m_Paused;
+ }
+ set
+ {
+ m_Paused = value;
+ }
  }
 
  /// <summary>
@@ -80,6 +97,11 @@ public int WaitingTaskCount
  /// <param name="realElapseSeconds">真实流逝时间，以秒为单位。</param>
  public void Update(float elapseSeconds, float realElapseSeconds)
  {
+ if (m_Paused)
+ {
+ return;
+ }
+
  ProcessRunningTasks(elapseSeconds, realElapseSeconds);
  ProcessWaitingTasks(elapseSeconds, realElapseSeconds);
  }

GameFramework/Config/ConfigManager.cs

@@ -518,7 +518,7 @@ private void LoadConfigSuccessCallback(string configAssetName, object configAsse
  {
  if (m_LoadConfigFailureEventHandler != null)
  {
- m_LoadConfigFailureEventHandler(this, new LoadConfigFailureEventArgs(configAssetName, exception.ToString(), loadConfigInfo.UserData));
+ m_LoadConfigFailureEventHandler(this, new LoadConfigFailureEventArgs(configAssetName, loadConfigInfo.LoadType, exception.ToString(), loadConfigInfo.UserData));
  return;
  }
 
@@ -531,7 +531,7 @@ private void LoadConfigSuccessCallback(string configAssetName, object configAsse
 
  if (m_LoadConfigSuccessEventHandler != null)
  {
- m_LoadConfigSuccessEventHandler(this, new LoadConfigSuccessEventArgs(configAssetName, duration, loadConfigInfo.UserData));
+ m_LoadConfigSuccessEventHandler(this, new LoadConfigSuccessEventArgs(configAssetName, loadConfigInfo.LoadType, duration, loadConfigInfo.UserData));
  }
  }
 
@@ -546,7 +546,7 @@ private void LoadConfigFailureCallback(string configAssetName, LoadResourceStatu
  string appendErrorMessage = Utility.Text.Format("Load config failure, asset name '{0}', status '{1}', error message '{2}'.", configAssetName, status.ToString(), errorMessage);
  if (m_LoadConfigFailureEventHandler != null)
  {
- m_LoadConfigFailureEventHandler(this, new LoadConfigFailureEventArgs(configAssetName, appendErrorMessage, loadConfigInfo.UserData));
+ m_LoadConfigFailureEventHandler(this, new LoadConfigFailureEventArgs(configAssetName, loadConfigInfo.LoadType, appendErrorMessage, loadConfigInfo.UserData));
  return;
  }
 
@@ -563,7 +563,7 @@ private void LoadConfigUpdateCallback(string configAssetName, float progress, ob
 
  if (m_LoadConfigUpdateEventHandler != null)
  {
- m_LoadConfigUpdateEventHandler(this, new LoadConfigUpdateEventArgs(configAssetName, progress, loadConfigInfo.UserData));
+ m_LoadConfigUpdateEventHandler(this, new LoadConfigUpdateEventArgs(configAssetName, loadConfigInfo.LoadType, progress, loadConfigInfo.UserData));
  }
  }
 

GameFramework/Config/LoadConfigFailureEventArgs.cs

@@ -16,11 +16,13 @@ public sealed class LoadConfigFailureEventArgs : GameFrameworkEventArgs
  /// 初始化加载配置失败事件的新实例。
  /// </summary>
  /// <param name="configAssetName">配置资源名称。</param>
+ /// <param name="loadType">配置加载方式。</param>
  /// <param name="errorMessage">错误信息。</param>
  /// <param name="userData">用户自定义数据。</param>
- public LoadConfigFailureEventArgs(string configAssetName, string errorMessage, object userData)
+ public LoadConfigFailureEventArgs(string configAssetName, LoadType loadType, string errorMessage, object userData)
  {
  ConfigAssetName = configAssetName;
+ LoadType = loadType;
  ErrorMessage = errorMessage;
  UserData = userData;
  }
@@ -34,6 +36,15 @@ public string ConfigAssetName
  private set;
  }
 
+ /// <summary>
+ /// 获取配置加载方式。
+ /// </summary>
+ public LoadType LoadType
+ {
+ get;
+ private set;
+ }
+
  /// <summary>
  /// 获取错误信息。
  /// </summary>

GameFramework/Config/LoadConfigSuccessEventArgs.cs

@@ -16,11 +16,13 @@ public sealed class LoadConfigSuccessEventArgs : GameFrameworkEventArgs
  /// 初始化加载配置成功事件的新实例。
  /// </summary>
  /// <param name="configAssetName">配置资源名称。</param>
+ /// <param name="loadType">配置加载方式。</param>
  /// <param name="duration">加载持续时间。</param>
  /// <param name="userData">用户自定义数据。</param>
- public LoadConfigSuccessEventArgs(string configAssetName, float duration, object userData)
+ public LoadConfigSuccessEventArgs(string configAssetName, LoadType loadType, float duration, object userData)
  {
  ConfigAssetName = configAssetName;
+ LoadType = loadType;
  Duration = duration;
  UserData = userData;
  }
@@ -34,6 +36,15 @@ public string ConfigAssetName
  private set;
  }
 
+ /// <summary>
+ /// 获取配置加载方式。
+ /// </summary>
+ public LoadType LoadType
+ {
+ get;
+ private set;
+ }
+
  /// <summary>
  /// 获取加载持续时间。
  /// </summary>

GameFramework/Config/LoadConfigUpdateEventArgs.cs

@@ -16,11 +16,13 @@ public sealed class LoadConfigUpdateEventArgs : GameFrameworkEventArgs
  /// 初始化加载配置更新事件的新实例。
  /// </summary>
  /// <param name="configAssetName">配置资源名称。</param>
+ /// <param name="loadType">配置加载方式。</param>
  /// <param name="progress">加载配置进度。</param>
  /// <param name="userData">用户自定义数据。</param>
- public LoadConfigUpdateEventArgs(string configAssetName, float progress, object userData)
+ public LoadConfigUpdateEventArgs(string configAssetName, LoadType loadType, float progress, object userData)
  {
  ConfigAssetName = configAssetName;
+ LoadType = loadType;
  Progress = progress;
  UserData = userData;
  }
@@ -34,6 +36,15 @@ public string ConfigAssetName
  private set;
  }
 
+ /// <summary>
+ /// 获取配置加载方式。
+ /// </summary>
+ public LoadType LoadType
+ {
+ get;
+ private set;
+ }
+
  /// <summary>
  /// 获取加载配置进度。
  /// </summary>

GameFramework/DataTable/DataTableManager.cs

@@ -793,7 +793,7 @@ private void LoadDataTableSuccessCallback(string dataTableAssetName, object data
  {
  if (m_LoadDataTableFailureEventHandler != null)
  {
- m_LoadDataTableFailureEventHandler(this, new LoadDataTableFailureEventArgs(dataTableAssetName, exception.ToString(), loadDataTableInfo.UserData));
+ m_LoadDataTableFailureEventHandler(this, new LoadDataTableFailureEventArgs(dataTableAssetName, loadDataTableInfo.LoadType, exception.ToString(), loadDataTableInfo.UserData));
  return;
  }
 
@@ -806,7 +806,7 @@ private void LoadDataTableSuccessCallback(string dataTableAssetName, object data
 
  if (m_LoadDataTableSuccessEventHandler != null)
  {
- m_LoadDataTableSuccessEventHandler(this, new LoadDataTableSuccessEventArgs(dataTableAssetName, duration, loadDataTableInfo.UserData));
+ m_LoadDataTableSuccessEventHandler(this, new LoadDataTableSuccessEventArgs(dataTableAssetName, loadDataTableInfo.LoadType, duration, loadDataTableInfo.UserData));
  }
  }
 
@@ -821,7 +821,7 @@ private void LoadDataTableFailureCallback(string dataTableAssetName, LoadResourc
  string appendErrorMessage = Utility.Text.Format("Load data table failure, asset name '{0}', status '{1}', error message '{2}'.", dataTableAssetName, status.ToString(), errorMessage);
  if (m_LoadDataTableFailureEventHandler != null)
  {
- m_LoadDataTableFailureEventHandler(this, new LoadDataTableFailureEventArgs(dataTableAssetName, appendErrorMessage, loadDataTableInfo.UserData));
+ m_LoadDataTableFailureEventHandler(this, new LoadDataTableFailureEventArgs(dataTableAssetName, loadDataTableInfo.LoadType, appendErrorMessage, loadDataTableInfo.UserData));
  return;
  }
 
@@ -838,7 +838,7 @@ private void LoadDataTableUpdateCallback(string dataTableAssetName, float progre
 
  if (m_LoadDataTableUpdateEventHandler != null)
  {
- m_LoadDataTableUpdateEventHandler(this, new LoadDataTableUpdateEventArgs(dataTableAssetName, progress, loadDataTableInfo.UserData));
+ m_LoadDataTableUpdateEventHandler(this, new LoadDataTableUpdateEventArgs(dataTableAssetName, loadDataTableInfo.LoadType, progress, loadDataTableInfo.UserData));
  }
  }
 

GameFramework/DataTable/LoadDataTableFailureEventArgs.cs

@@ -16,11 +16,13 @@ public sealed class LoadDataTableFailureEventArgs : GameFrameworkEventArgs
  /// 初始化加载数据表失败事件的新实例。
  /// </summary>
  /// <param name="dataTableAssetName">数据表资源名称。</param>
+ /// <param name="loadType">数据表加载方式。</param>
  /// <param name="errorMessage">错误信息。</param>
  /// <param name="userData">用户自定义数据。</param>
- public LoadDataTableFailureEventArgs(string dataTableAssetName, string errorMessage, object userData)
+ public LoadDataTableFailureEventArgs(string dataTableAssetName, LoadType loadType, string errorMessage, object userData)
  {
  DataTableAssetName = dataTableAssetName;
+ LoadType = loadType;
  ErrorMessage = errorMessage;
  UserData = userData;
  }
@@ -34,6 +36,15 @@ public string DataTableAssetName
  private set;
  }
 
+ /// <summary>
+ /// 获取数据表加载方式。
+ /// </summary>
+ public LoadType LoadType
+ {
+ get;
+ private set;
+ }
+
  /// <summary>
  /// 获取错误信息。
  /// </summary>

GameFramework/DataTable/LoadDataTableSuccessEventArgs.cs

@@ -16,11 +16,13 @@ public sealed class LoadDataTableSuccessEventArgs : GameFrameworkEventArgs
  /// 初始化加载数据表成功事件的新实例。
  /// </summary>
  /// <param name="dataTableAssetName">数据表资源名称。</param>
+ /// <param name="loadType">数据表加载方式。</param>
  /// <param name="duration">加载持续时间。</param>
  /// <param name="userData">用户自定义数据。</param>
- public LoadDataTableSuccessEventArgs(string dataTableAssetName, float duration, object userData)
+ public LoadDataTableSuccessEventArgs(string dataTableAssetName, LoadType loadType, float duration, object userData)
  {
  DataTableAssetName = dataTableAssetName;
+ LoadType = loadType;
  Duration = duration;
  UserData = userData;
  }
@@ -34,6 +36,15 @@ public string DataTableAssetName
  private set;
  }
 
+ /// <summary>
+ /// 获取数据表加载方式。
+ /// </summary>
+ public LoadType LoadType
+ {
+ get;
+ private set;
+ }
+
  /// <summary>
  /// 获取加载持续时间。
  /// </summary>

GameFramework/DataTable/LoadDataTableUpdateEventArgs.cs

@@ -16,11 +16,13 @@ public sealed class LoadDataTableUpdateEventArgs : GameFrameworkEventArgs
  /// 初始化加载数据表更新事件的新实例。
  /// </summary>
  /// <param name="dataTableAssetName">数据表资源名称。</param>
+ /// <param name="loadType">数据表加载方式。</param>
  /// <param name="progress">加载数据表进度。</param>
  /// <param name="userData">用户自定义数据。</param>
- public LoadDataTableUpdateEventArgs(string dataTableAssetName, float progress, object userData)
+ public LoadDataTableUpdateEventArgs(string dataTableAssetName, LoadType loadType, float progress, object userData)
  {
  DataTableAssetName = dataTableAssetName;
+ LoadType = loadType;
  Progress = progress;
  UserData = userData;
  }
@@ -34,6 +36,15 @@ public string DataTableAssetName
  private set;
  }
 
+ /// <summary>
+ /// 获取数据表加载方式。
+ /// </summary>
+ public LoadType LoadType
+ {
+ get;
+ private set;
+ }
+
  /// <summary>
  /// 获取加载数据表进度。
  /// </summary>

GameFramework/Download/DownloadAgentHelperCompleteEventArgs.cs

@@ -18,7 +18,7 @@ public sealed class DownloadAgentHelperCompleteEventArgs : GameFrameworkEventArg
  /// <param name="length">下载的数据大小。</param>
  public DownloadAgentHelperCompleteEventArgs(int length)
  {
- if (length <= 0)
+ if (length < 0)
  {
  throw new GameFrameworkException("Length is invalid.");
  }