Merge branch 'master' of https://github.com/VladimirKhil/SI

VladimirKhil · Feb 22, 2024 · 720cb1e · 720cb1e
2 parents f2c8c23 + 5288567
commit 720cb1e
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/src/SIGame/SIGame.ViewModel/ViewModel/ConnectionDataViewModel.cs b/src/SIGame/SIGame.ViewModel/ViewModel/ConnectionDataViewModel.cs
@@ -234,7 +234,7 @@ protected async Task ConnectCoreAsync(bool upgrade)
 
     private async void Join_Executed(object? arg) => await JoinGameAsync(null, (GameRole)arg);
 
-    protected virtual async Task JoinGameAsync(GameInfo gameInfo, GameRole role, bool host = false, CancellationToken cancellationToken = default)
+    protected virtual async Task JoinGameAsync(GameInfo? gameInfo, GameRole role, bool host = false, CancellationToken cancellationToken = default)
     {
         IsProgress = true;
 
@@ -259,7 +259,7 @@ protected virtual async Task JoinGameAsync(GameInfo gameInfo, GameRole role, boo
     }
 
     public virtual async Task JoinGameCoreAsync(
-        GameInfo gameInfo,
+        GameInfo? gameInfo,
         GameRole role,
         bool isHost = false,
         CancellationToken cancellationToken = default)

diff --git a/src/SIGame/SIGame.ViewModel/ViewModel/SIOnlineViewModel.cs b/src/SIGame/SIGame.ViewModel/ViewModel/SIOnlineViewModel.cs
@@ -921,6 +921,46 @@ protected override void Prepare(GameSettingsViewModel gameSettings)
 
         GameSettings.Message = Resources.Creating;
 
+
+        // TODO: enable after server update
+        //settings.AppSettings.Culture = Thread.CurrentThread.CurrentUICulture.Name;
+
+        //var runGameResponse = await _gameServerClient.RunGameAsync(
+        //    new SI.GameServer.Contract.RunGameRequest((
+        //        GameSettingsCore<AppSettingsCore>)settings,
+        //        packageInfo,
+        //        computerAccounts.Select(ca => ca.Account).ToArray()),
+        //    cancellationToken);
+
+        //if (!runGameResponse.IsSuccess)
+        //{
+        //    throw new Exception(GetMessage(runGameResponse.ErrorType));
+        //}
+
+        // GameSettings.Message = Resources.GameEntering;
+
+        //var name = Human.Name;
+
+        //_password = settings.NetworkGamePassword;
+
+        //var game = new GameInfo
+        //{
+        //    HostUri = runGameResponse.HostUri,
+        //    GameID = runGameResponse.GameId,
+        //    Owner = name
+        //};
+
+        //await JoinGameAsync(game, settings.Role, runGameResponse.IsHost, cancellationToken);
+
+        //if (_host == null)
+        //{
+        //    return null;
+        //}
+
+        //_host.Connector?.SetGameID(runGameResponse.GameId);
+
+        //return (_node, _host);
+
         if (_userSettings.UseSignalRConnection)
         {
             var gameCreatingResult2 = await _gameServerClient.CreateAndJoinGame2Async(