Collapse Unity player settings state read
This commit is contained in:
parent
06a3f8dab2
commit
abf5a2a337
2 changed files with 9 additions and 13 deletions
|
|
@ -16503,7 +16503,6 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root)
|
|||
var requiredRuntimeClientProviderSymbols = new[]
|
||||
{
|
||||
"public static class AetheriaUnityRuntimeClientProvider",
|
||||
"private static CultMeshReactiveDocument<AetheriaRuntimePlayerSettingsDocument> _playerSettingsDocument",
|
||||
"public static RuntimePlayerSettings PlayerSettings",
|
||||
"private static AetheriaClient ResolveClient(string stateFilePath, string runtimeId = \"\")",
|
||||
"private static AetheriaClient ResolveClient(AetheriaRuntimeStateBootReport stateBoot, string runtimeId = \"\")",
|
||||
|
|
@ -16519,9 +16518,7 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root)
|
|||
"RuntimeClients[cacheKey] = runtimeClient",
|
||||
"AetheriaClient",
|
||||
".State",
|
||||
"RuntimeState().ReactivePlayerSettingsDocument()",
|
||||
"_playerSettingsDocument.Current",
|
||||
"_playerSettingsDocument?.Dispose()",
|
||||
"RuntimeState().CurrentPlayerSettings()",
|
||||
"OpenAsync(",
|
||||
"pullOnOpen: true",
|
||||
"ApplyPlayerSettings(settings, stored)"
|
||||
|
|
@ -16538,10 +16535,14 @@ static void RequireRuntimeStateReaderOwnsUnityStateAcquisition(string root)
|
|||
|
||||
if (runtimeClientProvider.Contains("public static CultMeshReactiveDocument<TDocument> Reactive<TDocument>", StringComparison.Ordinal) ||
|
||||
runtimeClientProvider.Contains("public static CultMeshReactiveDocument<AetheriaRuntime", StringComparison.Ordinal) ||
|
||||
runtimeClientProvider.Contains("public static CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState> ReactiveEveSurface(", StringComparison.Ordinal))
|
||||
runtimeClientProvider.Contains("public static CultMeshReactiveDocument<global::Aetheria.State.Documents.EveSurfaceState> ReactiveEveSurface(", StringComparison.Ordinal) ||
|
||||
runtimeClientProvider.Contains("private static CultMeshReactiveDocument<AetheriaRuntimePlayerSettingsDocument> _playerSettingsDocument", StringComparison.Ordinal) ||
|
||||
runtimeClientProvider.Contains("RuntimeState().ReactivePlayerSettingsDocument()", StringComparison.Ordinal) ||
|
||||
runtimeClientProvider.Contains("_playerSettingsDocument.Current", StringComparison.Ordinal) ||
|
||||
runtimeClientProvider.Contains("_playerSettingsDocument?.Dispose()", StringComparison.Ordinal))
|
||||
{
|
||||
throw new InvalidOperationException(
|
||||
"AetheriaUnityRuntimeClientProvider should expose RuntimeState/Control/Ui and let AetheriaClientState own typed reactive document access; do not rebuild static ReactiveX facade wrappers.");
|
||||
"AetheriaUnityRuntimeClientProvider should expose RuntimeState/Control/Ui and read named current typed state for cached settings; do not rebuild static ReactiveX facade wrappers.");
|
||||
}
|
||||
|
||||
if (runtimeClientProvider.Contains("AetheriaRuntimePlayerSettingsSession _playerSettingsDocument", StringComparison.Ordinal) ||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ public static class AetheriaUnityRuntimeClientProvider
|
|||
{
|
||||
private static readonly Dictionary<string, AetheriaClient> RuntimeClients =
|
||||
new Dictionary<string, AetheriaClient>(StringComparer.Ordinal);
|
||||
private static CultMeshReactiveDocument<AetheriaRuntimePlayerSettingsDocument> _playerSettingsDocument;
|
||||
private static RuntimePlayerSettings _runtimePlayerSettings;
|
||||
private static bool _playerSettingsLoaded;
|
||||
|
||||
|
|
@ -119,8 +118,6 @@ public static class AetheriaUnityRuntimeClientProvider
|
|||
|
||||
public static void Dispose()
|
||||
{
|
||||
_playerSettingsDocument?.Dispose();
|
||||
_playerSettingsDocument = null;
|
||||
_runtimePlayerSettings = null;
|
||||
_playerSettingsLoaded = false;
|
||||
|
||||
|
|
@ -138,16 +135,14 @@ public static class AetheriaUnityRuntimeClientProvider
|
|||
{
|
||||
try
|
||||
{
|
||||
_playerSettingsDocument ??= RuntimeState().ReactivePlayerSettingsDocument();
|
||||
|
||||
var stored = _playerSettingsDocument.Current;
|
||||
var stored = RuntimeState().CurrentPlayerSettings();
|
||||
if (stored == null)
|
||||
return;
|
||||
|
||||
ApplyPlayerSettings(settings, stored);
|
||||
if (!_playerSettingsLoaded)
|
||||
{
|
||||
Debug.Log("Loaded Aetheria Verse player settings from reactive typed state.");
|
||||
Debug.Log("Loaded Aetheria Verse player settings from typed state.");
|
||||
_playerSettingsLoaded = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue