Skip to content

Commit b9aeab1

Browse files
authored
Merge pull request #5 from TORISOUP/add_joinlobbyfailed
CancellationTokenの定義漏れ修正
2 parents b59b4fd + 64f48d7 commit b9aeab1

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

Assets/Plugins/Pun2Task/Pun2TaskNetwork.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public static async UniTask ConnectToRegionAsync(string region, CancellationToke
149149
if (winIndex == 0) return;
150150
throw new ConnectionFailedException(disconnectCause);
151151
}
152-
152+
153153
/// <summary>
154154
/// PhotonNetwork.Disconnect
155155
/// </summary>
@@ -159,7 +159,7 @@ public static async UniTask DisconnectAsync()
159159
PhotonNetwork.Disconnect();
160160
await Pun2TaskCallback.OnDisconnectedAsync();
161161
}
162-
162+
163163
/// <summary>
164164
/// PhotonNetwork.Reconnect
165165
/// </summary>
@@ -184,7 +184,7 @@ public static async UniTask ReconnectAsync(CancellationToken token = default)
184184
#endregion
185185

186186
#region RoomConnection
187-
187+
188188
/// <summary>
189189
/// PhotonNetwork.CreateRoom
190190
/// </summary>
@@ -254,7 +254,7 @@ public static async UniTask<bool> JoinOrCreateRoomAsync(
254254
_ => throw new FailedToJoinRoomException(createFailedCode, createFailedMessage)
255255
};
256256
}
257-
257+
258258
/// <summary>
259259
/// PhotonNetwork.JoinRoom
260260
/// </summary>
@@ -317,7 +317,7 @@ public static async UniTask JoinRandomRoomAsync(
317317
if (winIndex == 0) return;
318318
throw new FailedToJoinRoomException(returnCode, message);
319319
}
320-
320+
321321
/// <summary>
322322
/// PhotonNetwork.RejoinRoom
323323
/// </summary>
@@ -338,7 +338,7 @@ public static async UniTask RejoinRoomAsync(string roomName, CancellationToken t
338338
if (winIndex == 0) return;
339339
throw new FailedToJoinRoomException(returnCode, message);
340340
}
341-
341+
342342
/// <summary>
343343
/// PhotonNetwork.ReconnectAndRejoin
344344
/// </summary>
@@ -358,22 +358,22 @@ public static async UniTask ReconnectAndRejoinAsync(CancellationToken token)
358358
if (winIndex == 0) return;
359359
throw new FailedToJoinRoomException(returnCode, message);
360360
}
361-
361+
362362
/// <summary>
363363
/// PhotonNetwork.LeaveRoom
364364
/// </summary>
365365
/// <param name="becomeInactive"></param>
366366
/// <exception cref="InvalidRoomOperationException">Throws when PhotonNetwork.LeaveRoom returns false.</exception>
367-
public static async UniTask LeaveRoomAsync(bool becomeInactive = true)
367+
public static async UniTask LeaveRoomAsync(bool becomeInactive = true, CancellationToken token = default)
368368
{
369369
if (!PhotonNetwork.LeaveRoom(becomeInactive))
370370
{
371371
throw new InvalidRoomOperationException("Failed to leave room.");
372372
}
373373

374-
await Pun2TaskCallback.OnLeftRoomAsync();
374+
await Pun2TaskCallback.OnLeftRoomAsync(token);
375375
}
376-
376+
377377
/// <summary>
378378
/// PhotonNetwork.JoinLobby
379379
/// </summary>
@@ -390,7 +390,7 @@ public static async UniTask JoinLobbyAsync(TypedLobby typedLobby = null,
390390

391391
await Pun2TaskCallback.OnJoinedLobbyAsync(token);
392392
}
393-
393+
394394
/// <summary>
395395
/// PhotonNetwork.LeaveLobby
396396
/// </summary>
@@ -407,7 +407,7 @@ public static async UniTask LeaveLobbyAsync(CancellationToken token = default)
407407
}
408408

409409
#endregion
410-
410+
411411
/// <summary>
412412
/// PhotonNetwork.GetCustomRoomList
413413
/// </summary>

0 commit comments

Comments
 (0)