diff --git a/Nebula.Launcher/Models/RobustServerEntry.cs b/Nebula.Launcher/Models/RobustServerEntry.cs index ccad506..e1cfc9a 100644 --- a/Nebula.Launcher/Models/RobustServerEntry.cs +++ b/Nebula.Launcher/Models/RobustServerEntry.cs @@ -45,10 +45,15 @@ public sealed record ServerStatus( List Tags, string Preset, int Players, + [property: JsonPropertyName("round_id")] int RoundId, + [property: JsonPropertyName("run_level")] int RunLevel, + [property: JsonPropertyName("panic_bunker")] bool PanicBunker, + [property: JsonPropertyName("round_start_time")] DateTime? RoundStartTime, + [property: JsonPropertyName("soft_max_players")] int SoftMaxPlayers); public sealed record ModulesInfo(Dictionary Modules); diff --git a/Nebula.Launcher/ViewModels/ServerListViewModel.cs b/Nebula.Launcher/ViewModels/ServerListViewModel.cs index 0b36be7..2f62078 100644 --- a/Nebula.Launcher/ViewModels/ServerListViewModel.cs +++ b/Nebula.Launcher/ViewModels/ServerListViewModel.cs @@ -20,7 +20,7 @@ public partial class ServerListViewModel : ViewModelBase public ServerListViewModel() { ServerInfos = new ObservableCollection(); - ServerInfos.Add(new ServerHubInfo("ss14://localhost",new ServerStatus("","TestCraft", [], "super", 12,55,1,false,DateTime.Now, 20),[])); + ServerInfos.Add(new ServerHubInfo("ss14://localhost",new ServerStatus("Nebula","TestCraft", ["16+","RU"], "super", 12,55,1,false,DateTime.Now, 20),[])); } //real think diff --git a/Nebula.Launcher/Views/Pages/ServerListView.axaml b/Nebula.Launcher/Views/Pages/ServerListView.axaml index 30402fb..8ce0f86 100644 --- a/Nebula.Launcher/Views/Pages/ServerListView.axaml +++ b/Nebula.Launcher/Views/Pages/ServerListView.axaml @@ -5,12 +5,12 @@ x:Class="Nebula.Launcher.Views.Pages.ServerListView" x:DataType="viewModels:ServerListViewModel" xmlns="https://github.com/avaloniaui" + xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:models="clr-namespace:Nebula.Launcher.Models" xmlns:viewModels="clr-namespace:Nebula.Launcher.ViewModels" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"> + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> @@ -25,55 +25,115 @@ + ColumnDefinitions="*,70" + Margin="0,5,0,5" + RowDefinitions="40,*"> + + + + + + + + + + + + + + + - + BorderThickness="0,2,2,0" + CornerRadius="0,10,10,10" + IsVisible="True" + Margin="0,0,5,0" + Opacity="40" + Padding="0"> + + + + + + + + + + + - - - - / - - + + + + + - - - - - - - - - - - - - + +