Skip to content

Commit

Permalink
chore: switch back to show term for now (#43)
Browse files Browse the repository at this point in the history
  • Loading branch information
NathanFlurry committed Aug 26, 2024
1 parent 0415de2 commit 882ab04
Show file tree
Hide file tree
Showing 14 changed files with 228 additions and 744 deletions.
5 changes: 3 additions & 2 deletions Assets/Configuration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System;
using System.IO;
using Newtonsoft.Json;
using Rivet.Editor;
using UnityEngine;

// TODO: Move in to generated backend
Expand All @@ -22,15 +21,17 @@ public string BackendEndpoint
get
{
string env = Environment.GetEnvironmentVariable("BACKEND_ENDPOINT");
Debug.Log($"Env {env}");
if (!string.IsNullOrEmpty(env)) return env;

var prefs = PlayerPrefs.GetString("BackendEndpoint");
Debug.Log($"Prefs {prefs}");
if (!string.IsNullOrEmpty(prefs)) return prefs;

var config = LoadRivetConfig();
Debug.Log($"Config {config?.BackendEndpoint}");
if (config != null) return config.BackendEndpoint;


Debug.LogWarning("Could not find BackendEndpoint");
return "http://localhost:6420";
}
Expand Down
25 changes: 21 additions & 4 deletions Assets/Examples/LobbiesServers/Prefabs/Player.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ GameObject:
- component: {fileID: 3207584769418723635}
- component: {fileID: 3965462004462762662}
- component: {fileID: 2786999543623527278}
- component: {fileID: 279330038607539582}
m_Layer: 0
m_Name: Player
m_TagString: Untagged
Expand Down Expand Up @@ -54,6 +55,7 @@ MonoBehaviour:
<PredictedSpawn>k__BackingField: {fileID: 0}
_networkBehaviours:
- {fileID: 1066971944226767979}
- {fileID: 279330038607539582}
<SerializedRootNetworkBehaviour>k__BackingField: {fileID: 0}
<NestedRootNetworkBehaviours>k__BackingField: []
SerializedTransformProperties:
Expand Down Expand Up @@ -160,7 +162,7 @@ CapsuleCollider:
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
m_Enabled: 0
serializedVersion: 2
m_Radius: 0.25
m_Height: 0.8
Expand All @@ -185,13 +187,28 @@ CharacterController:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Height: 2
m_Radius: 0.5
m_Height: 0.8
m_Radius: 0.25
m_SlopeLimit: 45
m_StepOffset: 0.3
m_SkinWidth: 0.08
m_MinMoveDistance: 0.001
m_Center: {x: 0, y: 0, z: 0}
m_Center: {x: 0, y: 0.4, z: 0}
--- !u!114 &279330038607539582
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8110614861790104705}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6d2c7ecd089cd4323a1f4579441ccfb0, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 1
_addedNetworkObject: {fileID: -6188795491314734926}
_networkObjectCache: {fileID: -6188795491314734926}
--- !u!1001 &2760826667780921781
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
Loading

0 comments on commit 882ab04

Please sign in to comment.