From 7e5e33e2285c6b21ae32ce9eef1df1d97abce536 Mon Sep 17 00:00:00 2001 From: MelekTaus Moribundus Date: Mon, 29 Jun 2026 20:12:58 +0200 Subject: [PATCH] Move the network prefabs list to Assets root and tidy editor tooling Move DefaultNetworkPrefabs.asset out of Assets/Settings back to the Assets root (where NGO expects it), and fix the PlaySceneWindow domain-reload toggle to read and write EnterPlayModeOptions correctly. --- Assets/{Settings => }/DefaultNetworkPrefabs.asset | 4 ++-- .../{Settings => }/DefaultNetworkPrefabs.asset.meta | 2 +- Assets/Scripts/Editor/PlaySceneWindow.cs | 11 +++++------ 3 files changed, 8 insertions(+), 9 deletions(-) rename Assets/{Settings => }/DefaultNetworkPrefabs.asset (100%) rename Assets/{Settings => }/DefaultNetworkPrefabs.asset.meta (79%) diff --git a/Assets/Settings/DefaultNetworkPrefabs.asset b/Assets/DefaultNetworkPrefabs.asset similarity index 100% rename from Assets/Settings/DefaultNetworkPrefabs.asset rename to Assets/DefaultNetworkPrefabs.asset index 391a999..668f3bf 100644 --- a/Assets/Settings/DefaultNetworkPrefabs.asset +++ b/Assets/DefaultNetworkPrefabs.asset @@ -15,12 +15,12 @@ MonoBehaviour: IsDefault: 1 List: - Override: 0 - Prefab: {fileID: 3510981371713521867, guid: cf153a3aea3d5da4f9d4cdbff0be8180, type: 3} + Prefab: {fileID: 5508335275054701003, guid: 6b0b58e8352625343951db00beb8cb0a, type: 3} SourcePrefabToOverride: {fileID: 0} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} - Override: 0 - Prefab: {fileID: 5508335275054701003, guid: 6b0b58e8352625343951db00beb8cb0a, type: 3} + Prefab: {fileID: 3510981371713521867, guid: cf153a3aea3d5da4f9d4cdbff0be8180, type: 3} SourcePrefabToOverride: {fileID: 0} SourceHashToOverride: 0 OverridingTargetPrefab: {fileID: 0} diff --git a/Assets/Settings/DefaultNetworkPrefabs.asset.meta b/Assets/DefaultNetworkPrefabs.asset.meta similarity index 79% rename from Assets/Settings/DefaultNetworkPrefabs.asset.meta rename to Assets/DefaultNetworkPrefabs.asset.meta index 97a992c..8f7fce6 100644 --- a/Assets/Settings/DefaultNetworkPrefabs.asset.meta +++ b/Assets/DefaultNetworkPrefabs.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 231a4db0603e8994f9e13e19108d58d1 +guid: b3c215a811d0c844a98c16e4d383c1f5 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Scripts/Editor/PlaySceneWindow.cs b/Assets/Scripts/Editor/PlaySceneWindow.cs index 62958b9..f99e6f1 100644 --- a/Assets/Scripts/Editor/PlaySceneWindow.cs +++ b/Assets/Scripts/Editor/PlaySceneWindow.cs @@ -206,15 +206,14 @@ namespace Chameleon.Editor sceneIndex = EditorGUILayout.Popup(sceneIndex, sceneNames); GUI.enabled = !isPlaying; - //var disabled = !EditorSettings.enterPlayModeOptionsEnabled; - var disabled = EditorSettings.enterPlayModeOptions != EnterPlayModeOptions.DisableDomainReload; + var disabled = !EditorSettings.enterPlayModeOptions.HasFlag(EnterPlayModeOptions.DisableDomainReload); GUI.color = disabled ? new(1, .75f, .5f) : new(.825f, .825f, .825f); disabled = EditorGUILayout.Toggle(disabled, GUILayout.Width(14)); EditorGUILayout.LabelField("Reload Domain", GUILayout.Width(86)); - //EditorSettings.enterPlayModeOptionsEnabled = !disabled; - EditorSettings.enterPlayModeOptions - = EnterPlayModeOptions.DisableDomainReload - | EnterPlayModeOptions.DisableSceneReload; + EditorSettings.enterPlayModeOptionsEnabled = !disabled; + EditorSettings.enterPlayModeOptions = disabled + ? EnterPlayModeOptions.None + : (EnterPlayModeOptions.DisableDomainReload | EnterPlayModeOptions.DisableSceneReload); } GUILayout.EndHorizontal();