Skip to content

Commit

Permalink
update to make build work
Browse files Browse the repository at this point in the history
  • Loading branch information
stilnat committed Sep 9, 2024
1 parent 96b9fab commit 688587c
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 8 deletions.
10 changes: 8 additions & 2 deletions Assets/Scripts/SS3D/Data/Paths.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using JetBrains.Annotations;
using ParrelSync;
using System.IO;
using UnityEngine;

#if UNITY_EDITOR
using ParrelSync;
#endif

namespace SS3D.Data
{
Expand All @@ -21,7 +23,11 @@ public static class Paths
/// </summary>
[NotNull]
private static string FullGamePath =>
#if UNITY_EDITOR
ClonesManager.IsClone() ? ClonesManager.GetOriginalProjectPath() : Path.GetFullPath(".");
#else
Path.GetFullPath(".");
#endif

/// <summary>
/// The path to the Config folder on the Editor project.
Expand Down
14 changes: 10 additions & 4 deletions Assets/Scripts/SS3D/Networking/Settings/NetworkSettings.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
using Coimbra;
using ParrelSync;
using SS3D.Core.Settings;
using SS3D.Data;
using SS3D.Logging;
using System;
using UnityEngine;

#if UNITY_EDITOR
using ParrelSync;
#endif

namespace SS3D.Networking.Settings
{
[ProjectSettings("SS3D/Core", "Network Settings")]
Expand Down Expand Up @@ -51,7 +52,12 @@ public sealed class NetworkSettings : ScriptableSettings

public string Ckey
{
get => ClonesManager.IsClone() ? _ckey + ClonesManager.CloneNameSuffix : _ckey;
get =>
#if UNITY_EDITOR
ClonesManager.IsClone() ? _ckey + ClonesManager.CloneNameSuffix : _ckey;
#else
_ckey;
#endif
set => _ckey = value;
}

Expand Down
2 changes: 1 addition & 1 deletion Assets/Settings/NetworkSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MonoBehaviour:
_preload: 1
_type: 2
NetworkType: 2
Ckey: editorUser
_ckey: unknown
ServerAddress: 127.0.0.1
ServerPort: 1151
EnableNetworkBandwidthUsageStats: 1
3 changes: 2 additions & 1 deletion ProjectSettings/EditorBuildSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Content/Scenes/Intro.unity
guid: 61687ab4465bb6e4d8164057bedc63db
- enabled: 1
- enabled: 0
path: Assets/Content/Scenes/Launcher.unity
guid: d03a300180bde5646b09bfa4c392679f
- enabled: 1
Expand All @@ -22,4 +22,5 @@ EditorBuildSettings:
guid: a7a0fb29f301d364a822be64003a90cb
m_configObjects:
com.unity.addressableassets: {fileID: 11400000, guid: 05f6fe7a31766d24eb823119e9f0f5a5, type: 2}
com.unity.input.settings: {fileID: 11400000, guid: 7e95d9e343a711348b669c67be95eade, type: 2}
com.unity.localization.settings: {fileID: 11400000, guid: b60ebf47fee797845ac53b5122978922, type: 2}
2 changes: 2 additions & 0 deletions ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ PlayerSettings:
- {fileID: 11400000, guid: 2024dd0c65f45424f98ac0c8a6979181, type: 2}
- {fileID: 11400000, guid: 97967903e9bd51b499aaa39639cc9bb2, type: 2}
- {fileID: 11400000, guid: 71d1eb78bf0499946bccc4daad2531fa, type: 2}
- {fileID: 11400000, guid: b60ebf47fee797845ac53b5122978922, type: 2}
- {fileID: 11400000, guid: 7e95d9e343a711348b669c67be95eade, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
Expand Down

0 comments on commit 688587c

Please sign in to comment.