Skip to content
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

Jump to bottom

Minor QoL improvements #1584

Closed
wants to merge 2 commits into from
Closed

Minor QoL improvements #1584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c97a3e
Show version as build timestamp
Mar 13, 2024
889f2b9
Use preprocessors to define default server
Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions client/Assets/Prefabs/Camera/TitleScreenCameraUI.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 9118101695640014375}
- component: {fileID: 2715235285887230562}
- component: {fileID: 7406126844779593833}
- component: {fileID: 6366927080075148121}
m_Layer: 5
m_Name: Version
m_TagString: Untagged
Expand Down Expand Up @@ -136,6 +137,19 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &6366927080075148121
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 270936414570726327}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3521625ad4bd54c91b248d4743e13b03, type: 3}
m_Name:
m_EditorClassIdentifier:
version: {fileID: 7406126844779593833}
--- !u!1 &524417006874143901
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -567,6 +581,7 @@ MonoBehaviour:
MouseMode: 1
isBackButton: 0
executeRelease: 0
listElement: 0
--- !u!1 &904415009785142596
GameObject:
m_ObjectHideFlags: 0
Expand Down
9 changes: 7 additions & 2 deletions client/Assets/Scripts/SelectServerIP.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@ public class SelectServerIP : MonoBehaviour
public static string serverNameString;

// TODO: This should be a config file
private const string _defaultServerName = "BRAZIL";
private const string _defaultServerIp = "brazil-testing.curseofmirra.com";
#if UNITY_EDITOR
private const string _defaultServerName = "LOCALHOST";
private const string _defaultServerIp = "localhost";
#else
private const string _defaultServerName = "BRAZIL";
private const string _defaultServerIp = "brazil-testing.curseofmirra.com";
#endif

public void SetServerIp()
{
Expand Down
16 changes: 16 additions & 0 deletions client/Assets/Scripts/VersionDisplay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using TMPro;
using UnityEngine;
using System.Reflection;
using System.IO;

public class VersionDisplay : MonoBehaviour
{
[SerializeField]
TextMeshProUGUI version;

void Start()
{
string buildTimestamp = new FileInfo(Assembly.GetExecutingAssembly().Location).LastWriteTimeUtc.ToString("yyyyMMddHHmmss");
version.text = "Version: " + buildTimestamp + "-pre-alpha";
}
}
11 changes: 11 additions & 0 deletions client/Assets/Scripts/VersionDisplay.cs.meta
View file
Open in desktop

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