fix: 解決 Ready 頁面沒有辦法選擇的問題

Game-as-a-Service · Jan 14, 2024 · 01aceee · 01aceee
1 parent 04e741f
commit 01aceee
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 17 deletions.
diff --git a/Client/Pages/Index.razor.cs b/Client/Pages/Index.razor.cs
@@ -32,7 +32,7 @@ private async Task SetupHubConnectionAsync()
                 options.AccessTokenProvider = async () => await Task.FromResult(AccessToken);
             })
             .Build();
-        Connection = new(Client);
+        Connection = new TypedHubConnection(Client);
         Connection.WelcomeEventHandler += (e) =>
         {
             UserId = e.PlayerId;

diff --git a/Client/Pages/Ready/ReadyPage.razor.cs b/Client/Pages/Ready/ReadyPage.razor.cs
@@ -13,22 +13,10 @@ public partial class ReadyPage
     public Player? CurrentPlayer => Players.FirstOrDefault(x => x.Id == UserId);
     protected override async Task OnInitializedAsync()
     {
-        Connection.PlayerJoinGameEventHandler += OnPlayerJoinGameEvent;
         Connection.GetReadyInfoEventHandler += OnGetReadyInfoEvent;
         await Connection.GetReadyInfo();
     }
     public void Update() => StateHasChanged();
-    private void OnPlayerJoinGameEvent(PlayerJoinGameEvent e)
-    {
-        var player = new Player
-        {
-            Id = e.PlayerId,
-            Name = e.PlayerId,
-            IsReady = false,
-        };
-        Players = Players.Append(player).ToList();
-        Update();
-    }
     private void OnGetReadyInfoEvent(GetReadyInfoEventArgs e)
     {
         Players = e.Players.Select(x => new Player

diff --git a/Client/Pages/TypedHubConnection.cs b/Client/Pages/TypedHubConnection.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.SignalR.Client;
-using SharedLibrary.ResponseArgs;
 using SharedLibrary.ResponseArgs.ReadyRoom;
 
 namespace Client.Pages;
@@ -18,8 +17,8 @@ internal class TypedHubConnection
     public TypedHubConnection(HubConnection hubConnection)
     {
         hubConnection.On<PlayerJoinGameEvent>(nameof(PlayerJoinGameEvent), (e) => PlayerJoinGameEventHandler?.Invoke(e));
-        hubConnection.On<GetReadyInfoEventArgs>(nameof(GetReadyInfoEventArgs), (e) => GetReadyInfoEventHandler?.Invoke(e));
-        hubConnection.On<WelcomeEventArgs>(nameof(WelcomeEventArgs), (e) => WelcomeEventHandler?.Invoke(e));
+        hubConnection.On<GetReadyInfoEventArgs>("GetReadyInfoEvent", (e) => GetReadyInfoEventHandler?.Invoke(e));
+        hubConnection.On<WelcomeEventArgs>("WelcomeEvent", (e) => WelcomeEventHandler?.Invoke(e));
         this.hubConnection = hubConnection;
     }
     public async Task GetReadyInfo() => await hubConnection.SendAsync("GetReadyInfo");

diff --git a/Server/Hubs/MonopolyHub.cs b/Server/Hubs/MonopolyHub.cs
@@ -5,7 +5,6 @@
 using Microsoft.AspNetCore.SignalR;
 using Server.Presenters;
 using SharedLibrary;
-using SharedLibrary.ResponseArgs;
 using System.Security.Claims;
 using SharedLibrary.ResponseArgs.Monopoly;
 using SharedLibrary.ResponseArgs.ReadyRoom;