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.
This commit is contained in:
1 parent
fbbc46cc6e
commit
7e5e33e228
3 files changed
+8
-9
No files matched your search
@@ -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}
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 231a4db0603e8994f9e13e19108d58d1
|
||||
guid: b3c215a811d0c844a98c16e4d383c1f5
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
@@ -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();
|
||||
|
||||
|
||||
Reference in new issue
Block a user