From 027a214479076d0b57606f22623b22803a687ab9 Mon Sep 17 00:00:00 2001 From: GeWuYou <95328647+GeWuYou@users.noreply.github.com> Date: Tue, 10 Mar 2026 08:42:53 +0800 Subject: [PATCH] =?UTF-8?q?refactor(core):=20=E5=B0=86System=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E7=A9=BA=E9=97=B4=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BA?= =?UTF-8?q?Systems?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新所有GFramework.Core.Abstractions.System引用为GFramework.Core.Abstractions.Systems - 重命名GFramework.Core/System目录为GFramework.Core/Systems - 重命名GFramework.Core.Tests/System目录为GFramework.Core.Tests/Systems - 更新所有相关using语句和命名空间声明 - 修复测试文件中的命名空间引用 - 添加全局using引用GFramework.Core.Systems --- GFramework.Core.Abstractions/Architecture/IArchitecture.cs | 2 +- .../Architecture/IArchitectureContext.cs | 2 +- GFramework.Core.Abstractions/IoC/IIocContainer.cs | 2 +- GFramework.Core.Abstractions/State/IStateMachineSystem.cs | 2 +- GFramework.Core.Abstractions/{System => Systems}/ISystem.cs | 2 +- .../Architecture/ArchitectureContextTests.cs | 2 +- .../Architecture/ArchitectureServicesTests.cs | 2 +- GFramework.Core.Tests/Architecture/AsyncTestArchitecture.cs | 2 +- GFramework.Core.Tests/Architecture/GameContextTests.cs | 2 +- GFramework.Core.Tests/Architecture/PriorityServiceTests.cs | 4 +--- .../Architecture/RegistryInitializationHookBaseTests.cs | 2 +- GFramework.Core.Tests/Architecture/SyncTestArchitecture.cs | 2 +- GFramework.Core.Tests/GlobalUsings.cs | 3 ++- GFramework.Core.Tests/IoC/MicrosoftDiContainerTests.cs | 3 +-- GFramework.Core.Tests/Logging/ConsoleLoggerTests.cs | 4 +--- .../Rule/ContextAwareServiceExtensionsTests.cs | 2 +- GFramework.Core.Tests/State/StateMachineSystemTests.cs | 2 +- GFramework.Core.Tests/{System => Systems}/AsyncTestSystem.cs | 4 ++-- GFramework.Core.Tests/{System => Systems}/TestSystem.cs | 4 ++-- GFramework.Core.Tests/Tests/AsyncArchitectureTests.cs | 3 +-- GFramework.Core.Tests/Tests/SyncArchitectureTests.cs | 2 +- GFramework.Core/Architectures/Architecture.cs | 2 +- GFramework.Core/Architectures/ArchitectureContext.cs | 2 +- GFramework.Core/Extensions/ContextAwareServiceExtensions.cs | 2 +- GFramework.Core/IoC/MicrosoftDiContainer.cs | 2 +- GFramework.Core/Pool/AbstractObjectPoolSystem.cs | 2 +- GFramework.Core/{System => Systems}/AbstractSystem.cs | 4 ++-- GFramework.Ecs.Arch.Abstractions/IArchSystemAdapter.cs | 2 +- GFramework.Ecs.Arch/ArchSystemAdapter.cs | 3 +-- GFramework.Game.Abstractions/Scene/ISceneRouter.cs | 2 +- GFramework.Game.Abstractions/Setting/ISettingsSystem.cs | 2 +- GFramework.Game.Abstractions/UI/IUiRouter.cs | 2 +- GFramework.Game/Scene/SceneRouterBase.cs | 2 +- GFramework.Game/Setting/SettingsSystem.cs | 2 +- GFramework.Game/UI/UiRouterBase.cs | 2 +- 35 files changed, 39 insertions(+), 45 deletions(-) rename GFramework.Core.Abstractions/{System => Systems}/ISystem.cs (89%) rename GFramework.Core.Tests/{System => Systems}/AsyncTestSystem.cs (92%) rename GFramework.Core.Tests/{System => Systems}/TestSystem.cs (94%) rename GFramework.Core/{System => Systems}/AbstractSystem.cs (95%) diff --git a/GFramework.Core.Abstractions/Architecture/IArchitecture.cs b/GFramework.Core.Abstractions/Architecture/IArchitecture.cs index 0b19f1f..87996ca 100644 --- a/GFramework.Core.Abstractions/Architecture/IArchitecture.cs +++ b/GFramework.Core.Abstractions/Architecture/IArchitecture.cs @@ -1,6 +1,6 @@ using GFramework.Core.Abstractions.Lifecycle; using GFramework.Core.Abstractions.Model; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Core.Abstractions.Utility; using Microsoft.Extensions.DependencyInjection; diff --git a/GFramework.Core.Abstractions/Architecture/IArchitectureContext.cs b/GFramework.Core.Abstractions/Architecture/IArchitectureContext.cs index d54687e..341d81a 100644 --- a/GFramework.Core.Abstractions/Architecture/IArchitectureContext.cs +++ b/GFramework.Core.Abstractions/Architecture/IArchitectureContext.cs @@ -3,7 +3,7 @@ using GFramework.Core.Abstractions.Environment; using GFramework.Core.Abstractions.Events; using GFramework.Core.Abstractions.Model; using GFramework.Core.Abstractions.Query; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Core.Abstractions.Utility; using Mediator; using ICommand = GFramework.Core.Abstractions.Command.ICommand; diff --git a/GFramework.Core.Abstractions/IoC/IIocContainer.cs b/GFramework.Core.Abstractions/IoC/IIocContainer.cs index c0bea01..42fcb7d 100644 --- a/GFramework.Core.Abstractions/IoC/IIocContainer.cs +++ b/GFramework.Core.Abstractions/IoC/IIocContainer.cs @@ -1,5 +1,5 @@ using GFramework.Core.Abstractions.Rule; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using Microsoft.Extensions.DependencyInjection; namespace GFramework.Core.Abstractions.IoC; diff --git a/GFramework.Core.Abstractions/State/IStateMachineSystem.cs b/GFramework.Core.Abstractions/State/IStateMachineSystem.cs index 3ecbc59..16a93eb 100644 --- a/GFramework.Core.Abstractions/State/IStateMachineSystem.cs +++ b/GFramework.Core.Abstractions/State/IStateMachineSystem.cs @@ -1,4 +1,4 @@ -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; namespace GFramework.Core.Abstractions.State; diff --git a/GFramework.Core.Abstractions/System/ISystem.cs b/GFramework.Core.Abstractions/Systems/ISystem.cs similarity index 89% rename from GFramework.Core.Abstractions/System/ISystem.cs rename to GFramework.Core.Abstractions/Systems/ISystem.cs index 5da4a02..22699b7 100644 --- a/GFramework.Core.Abstractions/System/ISystem.cs +++ b/GFramework.Core.Abstractions/Systems/ISystem.cs @@ -2,7 +2,7 @@ using GFramework.Core.Abstractions.Architecture; using GFramework.Core.Abstractions.Lifecycle; using GFramework.Core.Abstractions.Rule; -namespace GFramework.Core.Abstractions.System; +namespace GFramework.Core.Abstractions.Systems; /// /// 系统接口，定义了系统的基本行为和功能 diff --git a/GFramework.Core.Tests/Architecture/ArchitectureContextTests.cs b/GFramework.Core.Tests/Architecture/ArchitectureContextTests.cs index 2c1d8bf..d47c1b9 100644 --- a/GFramework.Core.Tests/Architecture/ArchitectureContextTests.cs +++ b/GFramework.Core.Tests/Architecture/ArchitectureContextTests.cs @@ -5,7 +5,7 @@ using GFramework.Core.Abstractions.Enums; using GFramework.Core.Abstractions.Environment; using GFramework.Core.Abstractions.Model; using GFramework.Core.Abstractions.Query; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Core.Abstractions.Utility; using GFramework.Core.Architectures; using GFramework.Core.Command; diff --git a/GFramework.Core.Tests/Architecture/ArchitectureServicesTests.cs b/GFramework.Core.Tests/Architecture/ArchitectureServicesTests.cs index 9dd1d01..d4c570a 100644 --- a/GFramework.Core.Tests/Architecture/ArchitectureServicesTests.cs +++ b/GFramework.Core.Tests/Architecture/ArchitectureServicesTests.cs @@ -5,7 +5,7 @@ using GFramework.Core.Abstractions.Events; using GFramework.Core.Abstractions.IoC; using GFramework.Core.Abstractions.Model; using GFramework.Core.Abstractions.Query; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Core.Abstractions.Utility; using GFramework.Core.Architectures; using GFramework.Core.Command; diff --git a/GFramework.Core.Tests/Architecture/AsyncTestArchitecture.cs b/GFramework.Core.Tests/Architecture/AsyncTestArchitecture.cs index b3793a7..56ec9a1 100644 --- a/GFramework.Core.Tests/Architecture/AsyncTestArchitecture.cs +++ b/GFramework.Core.Tests/Architecture/AsyncTestArchitecture.cs @@ -1,5 +1,5 @@ using GFramework.Core.Tests.Model; -using GFramework.Core.Tests.System; +using GFramework.Core.Tests.Systems; namespace GFramework.Core.Tests.Architecture; diff --git a/GFramework.Core.Tests/Architecture/GameContextTests.cs b/GFramework.Core.Tests/Architecture/GameContextTests.cs index aaa5fcb..749ba12 100644 --- a/GFramework.Core.Tests/Architecture/GameContextTests.cs +++ b/GFramework.Core.Tests/Architecture/GameContextTests.cs @@ -5,7 +5,7 @@ using GFramework.Core.Abstractions.Events; using GFramework.Core.Abstractions.IoC; using GFramework.Core.Abstractions.Model; using GFramework.Core.Abstractions.Query; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Core.Abstractions.Utility; using GFramework.Core.Architectures; using GFramework.Core.Command; diff --git a/GFramework.Core.Tests/Architecture/PriorityServiceTests.cs b/GFramework.Core.Tests/Architecture/PriorityServiceTests.cs index 7afa381..330b657 100644 --- a/GFramework.Core.Tests/Architecture/PriorityServiceTests.cs +++ b/GFramework.Core.Tests/Architecture/PriorityServiceTests.cs @@ -1,13 +1,11 @@ using System.Reflection; using GFramework.Core.Abstractions.Bases; using GFramework.Core.Abstractions.Model; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Core.Abstractions.Utility; using GFramework.Core.IoC; using GFramework.Core.Logging; using GFramework.Core.Model; -using GFramework.Core.System; -using NUnit.Framework; namespace GFramework.Core.Tests.Architecture; diff --git a/GFramework.Core.Tests/Architecture/RegistryInitializationHookBaseTests.cs b/GFramework.Core.Tests/Architecture/RegistryInitializationHookBaseTests.cs index 5201486..0ac9b24 100644 --- a/GFramework.Core.Tests/Architecture/RegistryInitializationHookBaseTests.cs +++ b/GFramework.Core.Tests/Architecture/RegistryInitializationHookBaseTests.cs @@ -2,7 +2,7 @@ using GFramework.Core.Abstractions.Architecture; using GFramework.Core.Abstractions.Enums; using GFramework.Core.Abstractions.Lifecycle; using GFramework.Core.Abstractions.Model; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Core.Abstractions.Utility; using GFramework.Core.Architectures; using Microsoft.Extensions.DependencyInjection; diff --git a/GFramework.Core.Tests/Architecture/SyncTestArchitecture.cs b/GFramework.Core.Tests/Architecture/SyncTestArchitecture.cs index 9e8ca08..91d1c19 100644 --- a/GFramework.Core.Tests/Architecture/SyncTestArchitecture.cs +++ b/GFramework.Core.Tests/Architecture/SyncTestArchitecture.cs @@ -1,5 +1,5 @@ using GFramework.Core.Tests.Model; -using GFramework.Core.Tests.System; +using GFramework.Core.Tests.Systems; namespace GFramework.Core.Tests.Architecture; diff --git a/GFramework.Core.Tests/GlobalUsings.cs b/GFramework.Core.Tests/GlobalUsings.cs index 6f0bb16..e13a9bc 100644 --- a/GFramework.Core.Tests/GlobalUsings.cs +++ b/GFramework.Core.Tests/GlobalUsings.cs @@ -17,4 +17,5 @@ global using System.Linq; global using System.Threading; global using System.Threading.Tasks; global using NUnit.Framework; -global using NUnit.Compatibility; \ No newline at end of file +global using NUnit.Compatibility; +global using GFramework.Core.Systems; \ No newline at end of file diff --git a/GFramework.Core.Tests/IoC/MicrosoftDiContainerTests.cs b/GFramework.Core.Tests/IoC/MicrosoftDiContainerTests.cs index f546354..c777f87 100644 --- a/GFramework.Core.Tests/IoC/MicrosoftDiContainerTests.cs +++ b/GFramework.Core.Tests/IoC/MicrosoftDiContainerTests.cs @@ -2,8 +2,7 @@ using System.Reflection; using GFramework.Core.Abstractions.Bases; using GFramework.Core.IoC; using GFramework.Core.Logging; -using GFramework.Core.Tests.System; -using NUnit.Framework; +using GFramework.Core.Tests.Systems; namespace GFramework.Core.Tests.IoC; diff --git a/GFramework.Core.Tests/Logging/ConsoleLoggerTests.cs b/GFramework.Core.Tests/Logging/ConsoleLoggerTests.cs index 1c37e0b..38a3829 100644 --- a/GFramework.Core.Tests/Logging/ConsoleLoggerTests.cs +++ b/GFramework.Core.Tests/Logging/ConsoleLoggerTests.cs @@ -1,8 +1,6 @@ -using System; using System.IO; using GFramework.Core.Abstractions.Logging; using GFramework.Core.Logging; -using NUnit.Framework; namespace GFramework.Core.Tests.Logging; @@ -161,7 +159,7 @@ public class ConsoleLoggerTests _logger.Error("Line 3"); var output = _stringWriter.ToString(); - var lines = output.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries); + var lines = output.Split([System.Environment.NewLine], StringSplitOptions.RemoveEmptyEntries); Assert.That(lines.Length, Is.EqualTo(3)); Assert.That(lines[0], Does.Contain("INFO")); diff --git a/GFramework.Core.Tests/Rule/ContextAwareServiceExtensionsTests.cs b/GFramework.Core.Tests/Rule/ContextAwareServiceExtensionsTests.cs index 9438386..35c035c 100644 --- a/GFramework.Core.Tests/Rule/ContextAwareServiceExtensionsTests.cs +++ b/GFramework.Core.Tests/Rule/ContextAwareServiceExtensionsTests.cs @@ -2,7 +2,7 @@ using GFramework.Core.Abstractions.Architecture; using GFramework.Core.Abstractions.Enums; using GFramework.Core.Abstractions.Model; using GFramework.Core.Abstractions.Rule; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Core.Abstractions.Utility; using GFramework.Core.Architectures; using GFramework.Core.Extensions; diff --git a/GFramework.Core.Tests/State/StateMachineSystemTests.cs b/GFramework.Core.Tests/State/StateMachineSystemTests.cs index 56ac143..fab9f93 100644 --- a/GFramework.Core.Tests/State/StateMachineSystemTests.cs +++ b/GFramework.Core.Tests/State/StateMachineSystemTests.cs @@ -1,7 +1,7 @@ using System.Reflection; using GFramework.Core.Abstractions.Enums; using GFramework.Core.Abstractions.State; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Core.Architectures; using GFramework.Core.Command; using GFramework.Core.Environment; diff --git a/GFramework.Core.Tests/System/AsyncTestSystem.cs b/GFramework.Core.Tests/Systems/AsyncTestSystem.cs similarity index 92% rename from GFramework.Core.Tests/System/AsyncTestSystem.cs rename to GFramework.Core.Tests/Systems/AsyncTestSystem.cs index d3d4c50..8c339a9 100644 --- a/GFramework.Core.Tests/System/AsyncTestSystem.cs +++ b/GFramework.Core.Tests/Systems/AsyncTestSystem.cs @@ -1,9 +1,9 @@ using GFramework.Core.Abstractions.Architecture; using GFramework.Core.Abstractions.Enums; using GFramework.Core.Abstractions.Lifecycle; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; -namespace GFramework.Core.Tests.System; +namespace GFramework.Core.Tests.Systems; /// /// 异步测试系统，实现 ISystem 和 IAsyncInitializable diff --git a/GFramework.Core.Tests/System/TestSystem.cs b/GFramework.Core.Tests/Systems/TestSystem.cs similarity index 94% rename from GFramework.Core.Tests/System/TestSystem.cs rename to GFramework.Core.Tests/Systems/TestSystem.cs index 404cef9..9fe6989 100644 --- a/GFramework.Core.Tests/System/TestSystem.cs +++ b/GFramework.Core.Tests/Systems/TestSystem.cs @@ -1,8 +1,8 @@ using GFramework.Core.Abstractions.Architecture; using GFramework.Core.Abstractions.Enums; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; -namespace GFramework.Core.Tests.System; +namespace GFramework.Core.Tests.Systems; /// /// 测试系统类，实现了ISystem接口 diff --git a/GFramework.Core.Tests/Tests/AsyncArchitectureTests.cs b/GFramework.Core.Tests/Tests/AsyncArchitectureTests.cs index 0cc5c3f..f49b1f5 100644 --- a/GFramework.Core.Tests/Tests/AsyncArchitectureTests.cs +++ b/GFramework.Core.Tests/Tests/AsyncArchitectureTests.cs @@ -1,8 +1,7 @@ using GFramework.Core.Abstractions.Enums; using GFramework.Core.Tests.Architecture; using GFramework.Core.Tests.Model; -using GFramework.Core.Tests.System; -using NUnit.Framework; +using GFramework.Core.Tests.Systems; using NUnit.Framework.Legacy; namespace GFramework.Core.Tests.Tests; diff --git a/GFramework.Core.Tests/Tests/SyncArchitectureTests.cs b/GFramework.Core.Tests/Tests/SyncArchitectureTests.cs index f5a7f42..b76f0c6 100644 --- a/GFramework.Core.Tests/Tests/SyncArchitectureTests.cs +++ b/GFramework.Core.Tests/Tests/SyncArchitectureTests.cs @@ -3,7 +3,7 @@ using GFramework.Core.Architectures; using GFramework.Core.Tests.Architecture; using GFramework.Core.Tests.Events; using GFramework.Core.Tests.Model; -using GFramework.Core.Tests.System; +using GFramework.Core.Tests.Systems; using NUnit.Framework.Legacy; namespace GFramework.Core.Tests.Tests; diff --git a/GFramework.Core/Architectures/Architecture.cs b/GFramework.Core/Architectures/Architecture.cs index 5225f04..3b958fb 100644 --- a/GFramework.Core/Architectures/Architecture.cs +++ b/GFramework.Core/Architectures/Architecture.cs @@ -5,7 +5,7 @@ using GFramework.Core.Abstractions.IoC; using GFramework.Core.Abstractions.Lifecycle; using GFramework.Core.Abstractions.Logging; using GFramework.Core.Abstractions.Model; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Core.Abstractions.Utility; using GFramework.Core.Environment; using GFramework.Core.Extensions; diff --git a/GFramework.Core/Architectures/ArchitectureContext.cs b/GFramework.Core/Architectures/ArchitectureContext.cs index a8bfeaf..27e2e73 100644 --- a/GFramework.Core/Architectures/ArchitectureContext.cs +++ b/GFramework.Core/Architectures/ArchitectureContext.cs @@ -5,7 +5,7 @@ using GFramework.Core.Abstractions.Events; using GFramework.Core.Abstractions.IoC; using GFramework.Core.Abstractions.Model; using GFramework.Core.Abstractions.Query; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Core.Abstractions.Utility; using Mediator; using ICommand = GFramework.Core.Abstractions.Command.ICommand; diff --git a/GFramework.Core/Extensions/ContextAwareServiceExtensions.cs b/GFramework.Core/Extensions/ContextAwareServiceExtensions.cs index b9fc681..9c6ed7a 100644 --- a/GFramework.Core/Extensions/ContextAwareServiceExtensions.cs +++ b/GFramework.Core/Extensions/ContextAwareServiceExtensions.cs @@ -1,6 +1,6 @@ using GFramework.Core.Abstractions.Model; using GFramework.Core.Abstractions.Rule; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Core.Abstractions.Utility; namespace GFramework.Core.Extensions; diff --git a/GFramework.Core/IoC/MicrosoftDiContainer.cs b/GFramework.Core/IoC/MicrosoftDiContainer.cs index ce8d5a9..2a4bb9f 100644 --- a/GFramework.Core/IoC/MicrosoftDiContainer.cs +++ b/GFramework.Core/IoC/MicrosoftDiContainer.cs @@ -1,7 +1,7 @@ using GFramework.Core.Abstractions.Bases; using GFramework.Core.Abstractions.IoC; using GFramework.Core.Abstractions.Logging; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Core.Logging; using GFramework.Core.Rule; using Mediator; diff --git a/GFramework.Core/Pool/AbstractObjectPoolSystem.cs b/GFramework.Core/Pool/AbstractObjectPoolSystem.cs index 774168d..2969b89 100644 --- a/GFramework.Core/Pool/AbstractObjectPoolSystem.cs +++ b/GFramework.Core/Pool/AbstractObjectPoolSystem.cs @@ -1,6 +1,6 @@ using System.Diagnostics; using GFramework.Core.Abstractions.Pool; -using GFramework.Core.System; +using GFramework.Core.Systems; namespace GFramework.Core.Pool; diff --git a/GFramework.Core/System/AbstractSystem.cs b/GFramework.Core/Systems/AbstractSystem.cs similarity index 95% rename from GFramework.Core/System/AbstractSystem.cs rename to GFramework.Core/Systems/AbstractSystem.cs index 73a98ef..2efa472 100644 --- a/GFramework.Core/System/AbstractSystem.cs +++ b/GFramework.Core/Systems/AbstractSystem.cs @@ -1,10 +1,10 @@ using GFramework.Core.Abstractions.Enums; using GFramework.Core.Abstractions.Logging; -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Core.Logging; using GFramework.Core.Rule; -namespace GFramework.Core.System; +namespace GFramework.Core.Systems; /// /// 抽象系统基类，实现系统接口的基本功能 diff --git a/GFramework.Ecs.Arch.Abstractions/IArchSystemAdapter.cs b/GFramework.Ecs.Arch.Abstractions/IArchSystemAdapter.cs index b1ec4c7..c2030a0 100644 --- a/GFramework.Ecs.Arch.Abstractions/IArchSystemAdapter.cs +++ b/GFramework.Ecs.Arch.Abstractions/IArchSystemAdapter.cs @@ -1,4 +1,4 @@ -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; namespace GFramework.Ecs.Arch.Abstractions; diff --git a/GFramework.Ecs.Arch/ArchSystemAdapter.cs b/GFramework.Ecs.Arch/ArchSystemAdapter.cs index 97894eb..91aff84 100644 --- a/GFramework.Ecs.Arch/ArchSystemAdapter.cs +++ b/GFramework.Ecs.Arch/ArchSystemAdapter.cs @@ -1,7 +1,6 @@ using Arch.Core; using GFramework.Core.Extensions; -using GFramework.Core.System; -using GFramework.Ecs.Arch.Abstractions; +using GFramework.Core.Systems; using ArchSys = Arch.System; namespace GFramework.Ecs.Arch; diff --git a/GFramework.Game.Abstractions/Scene/ISceneRouter.cs b/GFramework.Game.Abstractions/Scene/ISceneRouter.cs index 76441fb..4bb9049 100644 --- a/GFramework.Game.Abstractions/Scene/ISceneRouter.cs +++ b/GFramework.Game.Abstractions/Scene/ISceneRouter.cs @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; namespace GFramework.Game.Abstractions.Scene; diff --git a/GFramework.Game.Abstractions/Setting/ISettingsSystem.cs b/GFramework.Game.Abstractions/Setting/ISettingsSystem.cs index 2b6ad37..384e633 100644 --- a/GFramework.Game.Abstractions/Setting/ISettingsSystem.cs +++ b/GFramework.Game.Abstractions/Setting/ISettingsSystem.cs @@ -1,4 +1,4 @@ -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; namespace GFramework.Game.Abstractions.Setting; diff --git a/GFramework.Game.Abstractions/UI/IUiRouter.cs b/GFramework.Game.Abstractions/UI/IUiRouter.cs index 41e0017..c5ee283 100644 --- a/GFramework.Game.Abstractions/UI/IUiRouter.cs +++ b/GFramework.Game.Abstractions/UI/IUiRouter.cs @@ -1,4 +1,4 @@ -using GFramework.Core.Abstractions.System; +using GFramework.Core.Abstractions.Systems; using GFramework.Game.Abstractions.Enums; namespace GFramework.Game.Abstractions.UI; diff --git a/GFramework.Game/Scene/SceneRouterBase.cs b/GFramework.Game/Scene/SceneRouterBase.cs index be5460f..2b3ccec 100644 --- a/GFramework.Game/Scene/SceneRouterBase.cs +++ b/GFramework.Game/Scene/SceneRouterBase.cs @@ -14,7 +14,7 @@ using GFramework.Core.Abstractions.Logging; using GFramework.Core.Extensions; using GFramework.Core.Logging; -using GFramework.Core.System; +using GFramework.Core.Systems; using GFramework.Game.Abstractions.Enums; using GFramework.Game.Abstractions.Scene; diff --git a/GFramework.Game/Setting/SettingsSystem.cs b/GFramework.Game/Setting/SettingsSystem.cs index a0c62fd..4051502 100644 --- a/GFramework.Game/Setting/SettingsSystem.cs +++ b/GFramework.Game/Setting/SettingsSystem.cs @@ -1,5 +1,5 @@ using GFramework.Core.Extensions; -using GFramework.Core.System; +using GFramework.Core.Systems; using GFramework.Game.Abstractions.Setting; using GFramework.Game.Setting.Events; diff --git a/GFramework.Game/UI/UiRouterBase.cs b/GFramework.Game/UI/UiRouterBase.cs index e4f8ba4..529c2cb 100644 --- a/GFramework.Game/UI/UiRouterBase.cs +++ b/GFramework.Game/UI/UiRouterBase.cs @@ -1,7 +1,7 @@ using GFramework.Core.Abstractions.Logging; using GFramework.Core.Extensions; using GFramework.Core.Logging; -using GFramework.Core.System; +using GFramework.Core.Systems; using GFramework.Game.Abstractions.Enums; using GFramework.Game.Abstractions.UI;