更新GF

Xnovae · Jun 1, 2017 · 57c197a · 57c197a
1 parent 437ba17
commit 57c197a
Show file tree

Hide file tree

Showing 20 changed files with 19 additions and 0 deletions.
diff --git a/Assets/GameFramework/Libraries/GameFramework.dll b/Assets/GameFramework/Libraries/GameFramework.dll
diff --git a/Assets/GameFramework/Scripts/Runtime/Base/BaseComponent.cs b/Assets/GameFramework/Scripts/Runtime/Base/BaseComponent.cs
@@ -17,6 +17,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 基础组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Base")]
     public sealed class BaseComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/DataNode/DataNodeComponent.cs b/Assets/GameFramework/Scripts/Runtime/DataNode/DataNodeComponent.cs
@@ -14,6 +14,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 数据结点组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Data Node")]
     public sealed class DataNodeComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/DataTable/DataTableComponent.cs b/Assets/GameFramework/Scripts/Runtime/DataTable/DataTableComponent.cs
@@ -16,6 +16,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 数据表组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Data Table")]
     public sealed class DataTableComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/Debugger/DebuggerComponent.cs b/Assets/GameFramework/Scripts/Runtime/Debugger/DebuggerComponent.cs
@@ -15,6 +15,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 调试组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Debugger")]
     public sealed partial class DebuggerComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/Download/DownloadComponent.cs b/Assets/GameFramework/Scripts/Runtime/Download/DownloadComponent.cs
@@ -14,6 +14,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 下载组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Download")]
     public sealed class DownloadComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/Entity/EntityComponent.cs b/Assets/GameFramework/Scripts/Runtime/Entity/EntityComponent.cs
@@ -17,6 +17,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 实体组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Entity")]
     public sealed partial class EntityComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/Event/EventComponent.cs b/Assets/GameFramework/Scripts/Runtime/Event/EventComponent.cs
@@ -16,6 +16,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 事件组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Event")]
     public sealed class EventComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/Fsm/FsmComponent.cs b/Assets/GameFramework/Scripts/Runtime/Fsm/FsmComponent.cs
@@ -14,6 +14,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 有限状态机组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/FSM")]
     public sealed class FsmComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/Localization/LocalizationComponent.cs b/Assets/GameFramework/Scripts/Runtime/Localization/LocalizationComponent.cs
@@ -15,6 +15,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 本地化组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Localization")]
     public sealed class LocalizationComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/Network/NetworkComponent.cs b/Assets/GameFramework/Scripts/Runtime/Network/NetworkComponent.cs
@@ -14,6 +14,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 网络组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Network")]
     public sealed partial class NetworkComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/ObjectPool/ObjectPoolComponent.cs b/Assets/GameFramework/Scripts/Runtime/ObjectPool/ObjectPoolComponent.cs
@@ -14,6 +14,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 对象池组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Object Pool")]
     public sealed class ObjectPoolComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/Procedure/ProcedureComponent.cs b/Assets/GameFramework/Scripts/Runtime/Procedure/ProcedureComponent.cs
@@ -17,6 +17,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 流程组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Procedure")]
     public sealed class ProcedureComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/Resource/EditorResourceComponent.cs b/Assets/GameFramework/Scripts/Runtime/Resource/EditorResourceComponent.cs
@@ -22,6 +22,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 编辑器资源组件。
     /// </summary>
+    [DisallowMultipleComponent]
     public class EditorResourceComponent : MonoBehaviour, IResourceManager
     {
         private string m_ReadOnlyPath = null;

diff --git a/Assets/GameFramework/Scripts/Runtime/Resource/ResourceComponent.cs b/Assets/GameFramework/Scripts/Runtime/Resource/ResourceComponent.cs
@@ -17,6 +17,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 资源组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Resource")]
     public sealed partial class ResourceComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/Scene/SceneComponent.cs b/Assets/GameFramework/Scripts/Runtime/Scene/SceneComponent.cs
@@ -16,6 +16,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 场景组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Scene")]
     public sealed class SceneComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/Setting/SettingComponent.cs b/Assets/GameFramework/Scripts/Runtime/Setting/SettingComponent.cs
@@ -14,6 +14,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 配置组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Setting")]
     public sealed class SettingComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/Sound/SoundComponent.cs b/Assets/GameFramework/Scripts/Runtime/Sound/SoundComponent.cs
@@ -20,6 +20,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 声音组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Sound")]
     public sealed partial class SoundComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/UI/UIComponent.cs b/Assets/GameFramework/Scripts/Runtime/UI/UIComponent.cs
@@ -16,6 +16,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// 界面组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/UI")]
     public sealed partial class UIComponent : GameFrameworkComponent
     {

diff --git a/Assets/GameFramework/Scripts/Runtime/WebRequest/WebRequestComponent.cs b/Assets/GameFramework/Scripts/Runtime/WebRequest/WebRequestComponent.cs
@@ -14,6 +14,7 @@ namespace UnityGameFramework.Runtime
     /// <summary>
     /// Web 请求组件。
     /// </summary>
+    [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Web Request")]
     public sealed class WebRequestComponent : GameFrameworkComponent
     {