From 686dec326e44fa307a2a5031ca400c3308462cbb Mon Sep 17 00:00:00 2001 From: "JSD\\13999" <1399945104@qq.com> Date: Mon, 18 May 2026 14:42:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20FlowScope=20=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=A8=8B=E5=BA=8F=E9=9B=86=E5=BC=95=E7=94=A8=E8=BE=B9?= =?UTF-8?q?=E7=95=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FlowScope/Runtime/FlowScope.Runtime.asmdef | 2 +- .../FlowScope.Samples.MainMenuP0.asmdef | 17 +++++++++++++++++ .../FlowScope.Samples.MainMenuP0.asmdef.meta | 7 +++++++ .../Tests/EditMode/Flow/FeatureBaseTests.cs | 4 ++-- .../Tests/EditMode/Flow/GameFlowTests.cs | 6 +++--- .../EditMode/FlowScope.Tests.EditMode.asmdef | 2 +- .../PlayMode/FlowScope.Tests.PlayMode.asmdef | 3 ++- 7 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 My project/Assets/FlowScope/Samples/MainMenuP0/FlowScope.Samples.MainMenuP0.asmdef create mode 100644 My project/Assets/FlowScope/Samples/MainMenuP0/FlowScope.Samples.MainMenuP0.asmdef.meta diff --git a/My project/Assets/FlowScope/Runtime/FlowScope.Runtime.asmdef b/My project/Assets/FlowScope/Runtime/FlowScope.Runtime.asmdef index 81e459a..a4fae8f 100644 --- a/My project/Assets/FlowScope/Runtime/FlowScope.Runtime.asmdef +++ b/My project/Assets/FlowScope/Runtime/FlowScope.Runtime.asmdef @@ -2,7 +2,7 @@ "name": "FlowScope.Runtime", "rootNamespace": "FlowScope", "references": [ - "R3" + "R3.Unity" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/My project/Assets/FlowScope/Samples/MainMenuP0/FlowScope.Samples.MainMenuP0.asmdef b/My project/Assets/FlowScope/Samples/MainMenuP0/FlowScope.Samples.MainMenuP0.asmdef new file mode 100644 index 0000000..96b2c6e --- /dev/null +++ b/My project/Assets/FlowScope/Samples/MainMenuP0/FlowScope.Samples.MainMenuP0.asmdef @@ -0,0 +1,17 @@ +{ + "name": "FlowScope.Samples.MainMenuP0", + "rootNamespace": "FlowScope.Samples.MainMenuP0", + "references": [ + "FlowScope.Runtime", + "R3.Unity" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} diff --git a/My project/Assets/FlowScope/Samples/MainMenuP0/FlowScope.Samples.MainMenuP0.asmdef.meta b/My project/Assets/FlowScope/Samples/MainMenuP0/FlowScope.Samples.MainMenuP0.asmdef.meta new file mode 100644 index 0000000..dd25658 --- /dev/null +++ b/My project/Assets/FlowScope/Samples/MainMenuP0/FlowScope.Samples.MainMenuP0.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eb3b4bf3dfdc46e4a9352fc2203bbfd4 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/My project/Assets/FlowScope/Tests/EditMode/Flow/FeatureBaseTests.cs b/My project/Assets/FlowScope/Tests/EditMode/Flow/FeatureBaseTests.cs index 00fa1f0..572f9ef 100644 --- a/My project/Assets/FlowScope/Tests/EditMode/Flow/FeatureBaseTests.cs +++ b/My project/Assets/FlowScope/Tests/EditMode/Flow/FeatureBaseTests.cs @@ -1,11 +1,11 @@ using System; using System.Threading; using System.Threading.Tasks; -using FlowScope.Container; using FlowScope.Flow; using FlowScope.Resources; using NUnit.Framework; using R3; +using ContainerType = FlowScope.Container.Container; namespace FlowScope.Tests.EditMode.Flow { @@ -51,7 +51,7 @@ namespace FlowScope.Tests.EditMode.Flow private static FeatureContext CreateContext() { return new FeatureContext( - new Container(), + new ContainerType(), new TestResourceGroup(), new CompositeDisposable(), CancellationToken.None); diff --git a/My project/Assets/FlowScope/Tests/EditMode/Flow/GameFlowTests.cs b/My project/Assets/FlowScope/Tests/EditMode/Flow/GameFlowTests.cs index c1e6167..ce84f8a 100644 --- a/My project/Assets/FlowScope/Tests/EditMode/Flow/GameFlowTests.cs +++ b/My project/Assets/FlowScope/Tests/EditMode/Flow/GameFlowTests.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; using FlowScope.Config; -using FlowScope.Container; using FlowScope.Flow; using FlowScope.Resources; using FlowScope.Save; using NUnit.Framework; +using ContainerType = FlowScope.Container.Container; namespace FlowScope.Tests.EditMode.Flow { @@ -140,9 +140,9 @@ namespace FlowScope.Tests.EditMode.Flow public TestSaveService Save { get; } = new(); public TestResourceService Resource { get; } = new(); - public Container CreateRoot() + public ContainerType CreateRoot() { - var root = new Container(); + var root = new ContainerType(); root.RegisterInstance(Config); root.RegisterInstance(Save); root.RegisterInstance(Resource); diff --git a/My project/Assets/FlowScope/Tests/EditMode/FlowScope.Tests.EditMode.asmdef b/My project/Assets/FlowScope/Tests/EditMode/FlowScope.Tests.EditMode.asmdef index 1d7165e..28780eb 100644 --- a/My project/Assets/FlowScope/Tests/EditMode/FlowScope.Tests.EditMode.asmdef +++ b/My project/Assets/FlowScope/Tests/EditMode/FlowScope.Tests.EditMode.asmdef @@ -3,7 +3,7 @@ "rootNamespace": "FlowScope.Tests", "references": [ "FlowScope.Runtime", - "R3" + "R3.Unity" ], "includePlatforms": [ "Editor" diff --git a/My project/Assets/FlowScope/Tests/PlayMode/FlowScope.Tests.PlayMode.asmdef b/My project/Assets/FlowScope/Tests/PlayMode/FlowScope.Tests.PlayMode.asmdef index 03cbc33..abba59e 100644 --- a/My project/Assets/FlowScope/Tests/PlayMode/FlowScope.Tests.PlayMode.asmdef +++ b/My project/Assets/FlowScope/Tests/PlayMode/FlowScope.Tests.PlayMode.asmdef @@ -3,7 +3,8 @@ "rootNamespace": "FlowScope.Tests", "references": [ "FlowScope.Runtime", - "R3" + "FlowScope.Samples.MainMenuP0", + "R3.Unity" ], "includePlatforms": [], "excludePlatforms": [],