Skip to content

fix(localization): 重命名 Keys.Capability.Online 为 OnlineModule 消除嵌套类遮蔽 #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlianBlank merged 1 commit into from
Oct 24, 2026
Merged

fix(localization): 重命名 Keys.Capability.Online 为 OnlineModule 消除嵌套类遮蔽 #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Capability/GameFrameX.Capability.Online.Competition/OnlineCompetitionCapabilityModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ public sealed class OnlineCompetitionCapabilityModule : ICapabilityModule, IAdmi
null,
new[]
{
new CapabilityOptionalDependency("online-assets", Localization.Keys.Capability.Online.Competition.OptionalAssetsAbsent),
new CapabilityOptionalDependency("online-match", Localization.Keys.Capability.Online.Competition.OptionalMatchAbsent),
new CapabilityOptionalDependency("online-assets", Localization.Keys.Capability.OnlineModule.Competition.OptionalAssetsAbsent),
new CapabilityOptionalDependency("online-match", Localization.Keys.Capability.OnlineModule.Competition.OptionalMatchAbsent),
},
typeof(OnlineCompetitionOptions));

Expand Down
4 changes: 2 additions & 2 deletions Capability/GameFrameX.Capability.Online.Match/OnlineMatchCapabilityModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ public sealed class OnlineMatchCapabilityModule : ICapabilityModule, IAdminActio
null,
new[]
{
new CapabilityOptionalDependency("online-assets", Keys.Capability.Online.Match.OptionalAssetsAbsent),
new CapabilityOptionalDependency("online-matchmaking", Keys.Capability.Online.Match.OptionalMatchmakingAbsent),
new CapabilityOptionalDependency("online-assets", Keys.Capability.OnlineModule.Match.OptionalAssetsAbsent),
new CapabilityOptionalDependency("online-matchmaking", Keys.Capability.OnlineModule.Match.OptionalMatchmakingAbsent),
},
typeof(OnlineMatchOptions));

Expand Down
8 changes: 4 additions & 4 deletions Capability/GameFrameX.Capability.Online.Operations/OnlineOperationsCapabilityModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ public sealed class OnlineOperationsCapabilityModule : ICapabilityModule, IAdmin
new[] { "online-foundation" },
new[]
{
new CapabilityOptionalDependency("online-assets", Localization.Keys.Capability.Online.Operations.OptionalAssetsAbsent),
new CapabilityOptionalDependency("online-social", Localization.Keys.Capability.Online.Operations.OptionalSocialAbsent),
new CapabilityOptionalDependency("online-match", Localization.Keys.Capability.Online.Operations.OptionalMatchAbsent),
new CapabilityOptionalDependency("online-matchmaking", Localization.Keys.Capability.Online.Operations.OptionalMatchmakingAbsent),
new CapabilityOptionalDependency("online-assets", Localization.Keys.Capability.OnlineModule.Operations.OptionalAssetsAbsent),
new CapabilityOptionalDependency("online-social", Localization.Keys.Capability.OnlineModule.Operations.OptionalSocialAbsent),
new CapabilityOptionalDependency("online-match", Localization.Keys.Capability.OnlineModule.Operations.OptionalMatchAbsent),
new CapabilityOptionalDependency("online-matchmaking", Localization.Keys.Capability.OnlineModule.Operations.OptionalMatchmakingAbsent),
},
typeof(OnlineOperationsOptions));

Expand Down
2 changes: 1 addition & 1 deletion GameFrameX.Localization/Keys.Capability.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ public static class Assembly
/// <summary>
/// Online 能力族相关消息
/// </summary>
public static class Online
public static class OnlineModule
{
/// <summary>
/// online-match（对局）能力相关消息
Expand Down
4 changes: 2 additions & 2 deletions Tests/GameFrameX.Tests/Online/CapabilityDependencyCheckTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ public async Task Compose_MissingOptionalDependency_AssemblesAndDisclosesAbsentF
CapabilityRuntime runtime = null;
try
{
var featureKey = LocalizationKeys.Capability.Online.Match.OptionalAssetsAbsent;
var featureKey = LocalizationKeys.Capability.OnlineModule.Match.OptionalAssetsAbsent;
var registerInvoked = false;
MechanismScenario.First.Optional = new[] { new CapabilityOptionalDependency("ghost-optional", featureKey), };
MechanismScenario.First.Register = context => registerInvoked = true;
Expand Down Expand Up @@ -231,7 +231,7 @@ public async Task Compose_OptionalAbsenceReasons_DistinguishEnableListDisableLis
CapabilityRuntime runtime = null;
try
{
var featureKey = LocalizationKeys.Capability.Online.Match.OptionalAssetsAbsent;
var featureKey = LocalizationKeys.Capability.OnlineModule.Match.OptionalAssetsAbsent;
MechanismScenario.First.Optional = new[]
{
new CapabilityOptionalDependency("mech-second", featureKey),
Expand Down
4 changes: 2 additions & 2 deletions Tests/GameFrameX.Tests/Online/CapabilityServiceSharingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ public async Task GetOptionalService_DeclaredOptionalDependencyAbsent_ReturnsNul
{
var registerResolved = new SignalService { Marker = "sentinel", };
var activateResolved = new SignalService { Marker = "sentinel", };
MechanismScenario.First.Optional = new[] { new CapabilityOptionalDependency("mech-second", GameFrameX.Localization.Keys.Capability.Online.Match.OptionalAssetsAbsent), };
MechanismScenario.First.Optional = new[] { new CapabilityOptionalDependency("mech-second", GameFrameX.Localization.Keys.Capability.OnlineModule.Match.OptionalAssetsAbsent), };
MechanismScenario.First.Register = context => registerResolved = context.GetOptionalService<SignalService>();
MechanismScenario.First.Activate = (context, cancellationToken) =>
{
Expand Down Expand Up @@ -488,7 +488,7 @@ public async Task GetOptionalService_NoAbsentOptionalDependency_FailsFast()
CapabilityRuntime runtime = null;
try
{
MechanismScenario.First.Optional = new[] { new CapabilityOptionalDependency("mech-second", GameFrameX.Localization.Keys.Capability.Online.Match.OptionalAssetsAbsent), };
MechanismScenario.First.Optional = new[] { new CapabilityOptionalDependency("mech-second", GameFrameX.Localization.Keys.Capability.OnlineModule.Match.OptionalAssetsAbsent), };
MechanismScenario.First.Register = context => context.GetOptionalService<SignalService>();

var registerError = Assert.Throws<InvalidOperationException>(() => Compose(CreateOptions("mech-first", "mech-second")));
Expand Down
4 changes: 2 additions & 2 deletions Tests/GameFrameX.Tests/Online/OnlineCapabilityComposeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,8 +745,8 @@ await OnlineCapabilityTestHarness.WithRuntimeAsync(async runtime =>
}

Assert.Equal(2, match.AbsentFeatures.Count);
Assert.Contains(LocalizationService.GetString(GameFrameX.Localization.Keys.Capability.Online.Match.OptionalAssetsAbsent), match.AbsentFeatures);
Assert.Contains(LocalizationService.GetString(GameFrameX.Localization.Keys.Capability.Online.Match.OptionalMatchmakingAbsent), match.AbsentFeatures);
Assert.Contains(LocalizationService.GetString(GameFrameX.Localization.Keys.Capability.OnlineModule.Match.OptionalAssetsAbsent), match.AbsentFeatures);
Assert.Contains(LocalizationService.GetString(GameFrameX.Localization.Keys.Capability.OnlineModule.Match.OptionalMatchmakingAbsent), match.AbsentFeatures);

Assert.Contains(runtime.Host.Modules, module => module.Manifest.Id == "online-match");
await runtime.Host.StartAsync();
Expand Down
Loading