Skip to content

fix: Prefab project settings failing to load correctly #2575

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
ShadauxCat merged 3 commits into from
May 31, 2023
Merged

fix: Prefab project settings failing to load correctly #2575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4481de
fix: Prefab project settings failing to load correctly
ShadauxCat May 31, 2023
dd55ce2
standards
ShadauxCat May 31, 2023
4643a69
Removed debug method
ShadauxCat May 31, 2023
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
30 changes: 30 additions & 0 deletions com.unity.netcode.gameobjects/Editor/Configuration/NetcodeForGameObjectsProjectSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using UnityEditor;
using UnityEngine;

namespace Unity.Netcode.Editor.Configuration
{
[FilePath("ProjectSettings/NetcodeForGameObjects.asset", FilePathAttribute.Location.ProjectFolder)]
public class NetcodeForGameObjectsProjectSettings : ScriptableSingleton<NetcodeForGameObjectsProjectSettings>
{
internal static readonly string DefaultNetworkPrefabsPath = "Assets/DefaultNetworkPrefabs.asset";
[SerializeField] public string NetworkPrefabsPath = DefaultNetworkPrefabsPath;
public string TempNetworkPrefabsPath;

private void OnEnable()
{
if (NetworkPrefabsPath == "")
{
NetworkPrefabsPath = DefaultNetworkPrefabsPath;
}
TempNetworkPrefabsPath = NetworkPrefabsPath;
}

[SerializeField]
public bool GenerateDefaultNetworkPrefabs;

internal void SaveSettings()
{
Save(true);
}
}
}
3 changes: 3 additions & 0 deletions ...ity.netcode.gameobjects/Editor/Configuration/NetcodeForGameObjectsProjectSettings.cs.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 0 additions & 41 deletions com.unity.netcode.gameobjects/Editor/Configuration/NetcodeForGameObjectsSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using UnityEditor;
using UnityEngine;
using UnityEngine.Serialization;


namespace Unity.Netcode.Editor.Configuration
{
Expand Down Expand Up @@ -40,42 +37,4 @@ internal static void SetAutoAddNetworkObjectSetting(bool autoAddSetting)
EditorPrefs.SetBool(AutoAddNetworkObjectIfNoneExists, autoAddSetting);
}
}

[FilePath("ProjectSettings/NetcodeForGameObjects.settings", FilePathAttribute.Location.ProjectFolder)]
internal class NetcodeForGameObjectsProjectSettings : ScriptableSingleton<NetcodeForGameObjectsProjectSettings>
{
internal static readonly string DefaultNetworkPrefabsPath = "Assets/DefaultNetworkPrefabs.asset";
[SerializeField] public string NetworkPrefabsPath = DefaultNetworkPrefabsPath;
public string TempNetworkPrefabsPath;

private void OnEnable()
{
if (NetworkPrefabsPath == "")
{
NetworkPrefabsPath = DefaultNetworkPrefabsPath;
}
TempNetworkPrefabsPath = NetworkPrefabsPath;
}

[SerializeField]
[FormerlySerializedAs("GenerateDefaultNetworkPrefabs")]
private byte m_GenerateDefaultNetworkPrefabs;

public bool GenerateDefaultNetworkPrefabs
{
get
{
return m_GenerateDefaultNetworkPrefabs != 0;
}
set
{
m_GenerateDefaultNetworkPrefabs = (byte)(value ? 1 : 0);
}
}

internal void SaveSettings()
{
Save(true);
}
}
}
6 changes: 4 additions & 2 deletions ...ctSettings/NetcodeForGameObjects.settings → ...ojectSettings/NetcodeForGameObjects.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 0}
m_Script: {fileID: 11500000, guid: 2727d53a542a4c1aa312905c3a02d807, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Netcode.Editor:Unity.Netcode.Editor.Configuration:NetcodeForGameObjectsProjectSettings
m_EditorClassIdentifier:
NetworkPrefabsPath: Assets/DefaultNetworkPrefabs.asset
TempNetworkPrefabsPath: Assets/DefaultNetworkPrefabs.asset
GenerateDefaultNetworkPrefabs: 1