rematch use the same leave function, added a grace period for connection disconnect
This commit is contained in:
+184
-24
@@ -1,25 +1,185 @@
|
|||||||
Logger initiated at 5/16/2026 11:47:02 PM
|
Logger initiated at 5/17/2026 5:46:52 AM
|
||||||
|
|
||||||
[5/16/2026 11:47:02 PM] Cupid settings updated
|
[5/17/2026 5:46:52 AM] Cupid settings updated
|
||||||
[5/16/2026 11:47:02 PM] Cupid settings updated
|
[5/17/2026 5:46:52 AM] Cupid settings updated
|
||||||
[5/16/2026 11:47:10 PM] Starting matchmake as warlock
|
[5/17/2026 5:46:54 AM] Starting matchmake as warlock
|
||||||
[5/16/2026 11:47:13 PM] Got into a room
|
[5/17/2026 5:46:57 AM] Got into a room
|
||||||
[5/16/2026 11:47:13 PM] {"ok":true,"entry_fee":21,"rc_prize":34,"for_red":{"Players":[{"Name":"warlock2","LastSeen":1778955432808,"UserId":3,"l10_wins":1,"l10_losses":3},{"Name":"warlock","LastSeen":1778955433214,"UserId":2,"l10_wins":3,"l10_losses":1}],"GameName":"soccar","Port":26614,"InitTime":1778955432808,"entry_fee":21,"match_id":32,"instance_started":true,"rc_prize":34,"your_team":"red"},"for_blue":{"Players":[{"Name":"warlock2","LastSeen":1778955432808,"UserId":3,"l10_wins":1,"l10_losses":3},{"Name":"warlock","LastSeen":1778955433214,"UserId":2,"l10_wins":3,"l10_losses":1}],"GameName":"soccar","Port":26614,"InitTime":1778955432808,"entry_fee":21,"match_id":32,"instance_started":true,"rc_prize":34,"your_team":"blue"}}
|
[5/17/2026 5:46:57 AM] {"ok":true,"entry_fee":21,"rc_prize":34,"for_red":{"Players":[{"Name":"King LuLu","LastSeen":1778977016845,"UserId":7,"l10_wins":2,"l10_losses":1},{"Name":"warlock","LastSeen":1778977017218,"UserId":2,"l10_wins":4,"l10_losses":1}],"GameName":"soccar","Port":26896,"InitTime":1778977016845,"entry_fee":21,"match_id":39,"instance_started":true,"rc_prize":34,"your_team":"red"},"for_blue":{"Players":[{"Name":"King LuLu","LastSeen":1778977016845,"UserId":7,"l10_wins":2,"l10_losses":1},{"Name":"warlock","LastSeen":1778977017218,"UserId":2,"l10_wins":4,"l10_losses":1}],"GameName":"soccar","Port":26896,"InitTime":1778977016845,"entry_fee":21,"match_id":39,"instance_started":true,"rc_prize":34,"your_team":"blue"}}
|
||||||
[5/16/2026 11:47:13 PM] Configured dedicated match reporting for match id 32 with secret 38516e39d3406225b7c3015a66e5d25c54e9b2024c0755212122bdcea3e3a328 and internal api base https://kickkingsapi.playpoolstudios.com
|
[5/17/2026 5:46:57 AM] Configured dedicated match reporting for match id 39 with secret 38516e39d3406225b7c3015a66e5d25c54e9b2024c0755212122bdcea3e3a328 and internal api base https://kickkingsapi.playpoolstudios.com
|
||||||
[5/16/2026 11:47:13 PM] Setting cupid to load game scene
|
[5/17/2026 5:46:57 AM] Setting cupid to load game scene
|
||||||
[5/16/2026 11:47:13 PM] Loading game scene
|
[5/17/2026 5:46:57 AM] Loading game scene
|
||||||
[5/16/2026 11:47:17 PM] Starting client at $kickkingsapi.playpoolstudios.com:26614
|
[5/17/2026 5:47:01 AM] Starting client at $kickkingsapi.playpoolstudios.com:26896
|
||||||
[5/16/2026 11:47:18 PM] Client connected
|
[5/17/2026 5:47:02 AM] Client connected
|
||||||
[5/16/2026 11:47:26 PM] Selected team changed from Red to Blue
|
[5/17/2026 5:47:10 AM] Selected team changed from Red to Blue
|
||||||
[5/16/2026 11:47:30 PM] Score changed from 0 to 1
|
[5/17/2026 5:47:15 AM] Selected team changed from Blue to Red
|
||||||
[5/16/2026 11:47:33 PM] Selected team changed from Blue to Red
|
[5/17/2026 5:47:25 AM] Selected team changed from Red to Blue
|
||||||
[5/16/2026 11:47:39 PM] Selected team changed from Red to Blue
|
[5/17/2026 5:47:29 AM] Selected team changed from Blue to Red
|
||||||
[5/16/2026 11:47:43 PM] Selected team changed from Blue to Red
|
[5/17/2026 5:47:41 AM] Selected team changed from Red to Blue
|
||||||
[5/16/2026 11:47:48 PM] Selected team changed from Red to Blue
|
[5/17/2026 5:47:46 AM] Selected team changed from Blue to Red
|
||||||
[5/16/2026 11:47:50 PM] Score changed from 1 to 2
|
[5/17/2026 5:47:52 AM] Selected team changed from Red to Blue
|
||||||
[5/16/2026 11:47:53 PM] Selected team changed from Blue to Red
|
[5/17/2026 5:47:56 AM] Selected team changed from Blue to Red
|
||||||
[5/16/2026 11:47:57 PM] Selected team changed from Red to Blue
|
[5/17/2026 5:48:05 AM] Selected team changed from Red to Blue
|
||||||
[5/16/2026 11:48:02 PM] Score changed from 2 to 3
|
[5/17/2026 5:48:11 AM] Selected team changed from Blue to Red
|
||||||
[5/16/2026 11:48:14 PM] Client disconnected
|
[5/17/2026 5:48:22 AM] Selected team changed from Red to Blue
|
||||||
[5/16/2026 11:48:18 PM] Cupid settings updated
|
[5/17/2026 5:48:31 AM] Selected team changed from Blue to Red
|
||||||
[5/16/2026 11:48:18 PM] Cupid settings updated
|
[5/17/2026 5:48:38 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:48:42 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:48:51 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:49:07 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:49:09 AM] Score changed from 0 to 1
|
||||||
|
[5/17/2026 5:49:12 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:49:21 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:49:30 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:49:44 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:49:51 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:49:56 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:50:12 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:50:18 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:50:23 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:50:29 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:50:38 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:50:42 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:50:55 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:51:01 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:51:09 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:51:14 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:51:16 AM] Score changed from 1 to 2
|
||||||
|
[5/17/2026 5:51:19 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:51:26 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:51:36 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:51:41 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:51:46 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:51:51 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:51:58 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:52:03 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:52:08 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:52:13 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:52:21 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:52:23 AM] Score changed from 0 to 1
|
||||||
|
[5/17/2026 5:52:26 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:52:35 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:52:41 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:52:50 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:52:54 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:53:00 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:53:04 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:53:11 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:53:16 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:53:20 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:53:24 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:53:39 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:53:44 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:53:55 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:54:01 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:54:05 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:54:09 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:54:27 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:54:34 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:54:48 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:54:54 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:54:56 AM] Score changed from 2 to 3
|
||||||
|
[5/17/2026 5:55:10 AM] Configured dedicated match reporting for match id 40 with secret 38516e39d3406225b7c3015a66e5d25c54e9b2024c0755212122bdcea3e3a328 and internal api base https://kickkingsapi.playpoolstudios.com
|
||||||
|
[5/17/2026 5:55:10 AM] Client disconnected
|
||||||
|
[5/17/2026 5:55:14 AM] Starting client at $kickkingsapi.playpoolstudios.com:26660
|
||||||
|
[5/17/2026 5:55:15 AM] Client connected
|
||||||
|
[5/17/2026 5:55:21 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:55:27 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:55:31 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:55:36 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:55:40 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:55:44 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:55:46 AM] Score changed from 0 to 1
|
||||||
|
[5/17/2026 5:55:49 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:55:54 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:56:02 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:56:05 AM] Score changed from 0 to 1
|
||||||
|
[5/17/2026 5:56:08 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:56:11 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:56:18 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:56:23 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:56:30 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:56:39 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:56:46 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:56:49 AM] Score changed from 1 to 2
|
||||||
|
[5/17/2026 5:56:52 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:56:58 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:57:03 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:57:06 AM] Score changed from 1 to 2
|
||||||
|
[5/17/2026 5:57:09 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:57:18 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:57:24 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:57:31 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:57:36 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:57:41 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:57:47 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:57:55 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:57:59 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:58:07 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:58:14 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:58:21 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:58:26 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:58:31 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:58:37 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:58:44 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:58:50 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:58:56 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:59:03 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:59:07 AM] Score changed from 2 to 3
|
||||||
|
[5/17/2026 5:59:22 AM] Configured dedicated match reporting for match id 41 with secret 38516e39d3406225b7c3015a66e5d25c54e9b2024c0755212122bdcea3e3a328 and internal api base https://kickkingsapi.playpoolstudios.com
|
||||||
|
[5/17/2026 5:59:22 AM] Client disconnected
|
||||||
|
[5/17/2026 5:59:25 AM] Starting client at $kickkingsapi.playpoolstudios.com:26153
|
||||||
|
[5/17/2026 5:59:26 AM] Client connected
|
||||||
|
[5/17/2026 5:59:33 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:59:39 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 5:59:46 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 5:59:51 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:00:04 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:00:08 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:00:16 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:00:19 AM] Score changed from 0 to 1
|
||||||
|
[5/17/2026 6:00:22 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:00:30 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:00:36 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:00:41 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:00:46 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:00:57 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:01:01 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:01:06 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:01:11 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:01:15 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:01:23 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:01:32 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:01:38 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:01:42 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:01:46 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:02:04 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:02:10 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:02:15 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:02:20 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:02:27 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:02:33 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:02:39 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:02:49 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:02:53 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:03:00 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:03:04 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:03:10 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:03:14 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:03:20 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:03:21 AM] Score changed from 0 to 1
|
||||||
|
[5/17/2026 6:03:24 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:03:30 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:03:39 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:03:44 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:03:52 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:03:57 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:04:07 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:04:10 AM] Score changed from 1 to 2
|
||||||
|
[5/17/2026 6:04:13 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:04:17 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:04:22 AM] Selected team changed from Blue to Red
|
||||||
|
[5/17/2026 6:04:26 AM] Selected team changed from Red to Blue
|
||||||
|
[5/17/2026 6:04:28 AM] Score changed from 2 to 3
|
||||||
|
[5/17/2026 6:04:36 AM] Client disconnected
|
||||||
|
[5/17/2026 6:04:37 AM] Cupid settings updated
|
||||||
|
[5/17/2026 6:04:38 AM] Cupid settings updated
|
||||||
|
|||||||
@@ -808,10 +808,22 @@ public class GameManager : NetworkBehaviour
|
|||||||
// LevelLoadManager.LoadLevel("MainMenu");
|
// LevelLoadManager.LoadLevel("MainMenu");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Leave(){
|
public void Leave(string levelName = "MainMenu"){
|
||||||
NetManager.MarkIntentionalClientDisconnect();
|
NetManager.MarkIntentionalClientDisconnect();
|
||||||
StopClient();
|
StopClient();
|
||||||
LevelLoadManager.LoadLevel("MainMenu");
|
|
||||||
|
StartCoroutine(CoroutineWaitTillDisconnection(levelName));
|
||||||
|
}
|
||||||
|
|
||||||
|
IEnumerator CoroutineWaitTillDisconnection(string levelName){
|
||||||
|
LevelLoadManager.instance.Show(); //Load the UI until the level is loaded
|
||||||
|
while(NetworkClient.isConnected){
|
||||||
|
yield return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
yield return new WaitForSeconds(1f); //Just to make sure
|
||||||
|
|
||||||
|
LevelLoadManager.LoadLevel(levelName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -530,8 +530,7 @@ public class NetPlayer : NetworkBehaviour
|
|||||||
Cupid.RoomPort = branch.Port;
|
Cupid.RoomPort = branch.Port;
|
||||||
LoginManager.SetMatchYourTeam(branch.your_team);
|
LoginManager.SetMatchYourTeam(branch.your_team);
|
||||||
|
|
||||||
GameManager.instance.StopClient();
|
GameManager.instance.Leave("Game");
|
||||||
LevelLoadManager.LoadLevel("Game");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnRematchCancelledServer(){
|
void OnRematchCancelledServer(){
|
||||||
|
|||||||
@@ -87,6 +87,7 @@ public class LevelLoadManager : MonoBehaviour
|
|||||||
|
|
||||||
|
|
||||||
public void Show(){
|
public void Show(){
|
||||||
|
if(isShowing){return;} //already is showing
|
||||||
canvasGroup.blocksRaycasts=true;
|
canvasGroup.blocksRaycasts=true;
|
||||||
canvasGroup.interactable=true;
|
canvasGroup.interactable=true;
|
||||||
contentImage.fillOrigin = 0;
|
contentImage.fillOrigin = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user