Skip to content

Commit 46ea2f0

Browse files
author
Jannify
authored
Updated MainMenu-UI (SubnauticaNitrox#1353)
1 parent 2762864 commit 46ea2f0

6 files changed

Lines changed: 326 additions & 374 deletions

File tree

Nitrox.sln.DotSettings

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@
3737
<s:String x:Key="/Default/CodeStyle/Generate/=Constructor/Options/=CheckForNull/@EntryIndexedValue">False</s:String>
3838
<s:Boolean x:Key="/Default/CodeStyle/Generate/=Implementations/@KeyIndexDefined">True</s:Boolean>
3939
<s:String x:Key="/Default/CodeStyle/Generate/=Implementations/Options/=Mutable/@EntryIndexedValue">False</s:String>
40+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GUI/@EntryIndexedValue">GUI</s:String>
4041
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HSB/@EntryIndexedValue">HSB</s:String>
4142
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
4243
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IK/@EntryIndexedValue">IK</s:String>
44+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
4345
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PDA/@EntryIndexedValue">PDA</s:String>
4446
<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
4547
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /&gt;</s:String>

NitroxClient/MonoBehaviours/DiscordRP/DiscordRPController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ public static DiscordRPController Main
3636
public void JoinCallback(string secret)
3737
{
3838
Log.Info("[Discord] Joining Server");
39-
if (SceneManager.GetActiveScene().name == "StartScreen" && MainMenuMultiplayerPanel.Main != null)
39+
if (SceneManager.GetActiveScene().name == "StartScreen")
4040
{
4141
string[] splitSecret = secret.Split(':');
4242
string ip = splitSecret[0];
4343
string port = splitSecret[1];
44-
MainMenuMultiplayerPanel.Main.OpenJoinServerMenu(ip,port);
44+
MainMenuMultiplayerPanel.OpenJoinServerMenu(ip, port);
4545
}
4646
else
4747
{

0 commit comments

Comments
 (0)