diff --git a/Assets/Log.txt b/Assets/Log.txt index d5bdaf04..6f7413e5 100644 --- a/Assets/Log.txt +++ b/Assets/Log.txt @@ -1,185 +1,25 @@ -Logger initiated at 5/17/2026 5:46:52 AM +Logger initiated at 5/17/2026 7:06:49 PM -[5/17/2026 5:46:52 AM] Cupid settings updated -[5/17/2026 5:46:52 AM] Cupid settings updated -[5/17/2026 5:46:54 AM] Starting matchmake as warlock -[5/17/2026 5:46:57 AM] Got into a room -[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/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/17/2026 5:46:57 AM] Setting cupid to load game scene -[5/17/2026 5:46:57 AM] Loading game scene -[5/17/2026 5:47:01 AM] Starting client at $kickkingsapi.playpoolstudios.com:26896 -[5/17/2026 5:47:02 AM] Client connected -[5/17/2026 5:47:10 AM] Selected team changed from Red to Blue -[5/17/2026 5:47:15 AM] Selected team changed from Blue to Red -[5/17/2026 5:47:25 AM] Selected team changed from Red to Blue -[5/17/2026 5:47:29 AM] Selected team changed from Blue to Red -[5/17/2026 5:47:41 AM] Selected team changed from Red to Blue -[5/17/2026 5:47:46 AM] Selected team changed from Blue to Red -[5/17/2026 5:47:52 AM] Selected team changed from Red to Blue -[5/17/2026 5:47:56 AM] Selected team changed from Blue to Red -[5/17/2026 5:48:05 AM] Selected team changed from Red to Blue -[5/17/2026 5:48:11 AM] Selected team changed from Blue to Red -[5/17/2026 5:48:22 AM] Selected team changed from Red to Blue -[5/17/2026 5:48:31 AM] Selected team changed from Blue to Red -[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 +[5/17/2026 7:06:49 PM] Cupid settings updated +[5/17/2026 7:06:49 PM] Cupid settings updated +[5/17/2026 7:06:50 PM] Starting matchmake as warlock +[5/17/2026 7:06:53 PM] Got into a room +[5/17/2026 7:06:53 PM] {"ok":true,"entry_fee":21,"rc_prize":34,"for_red":{"Players":[{"Name":"warlock3","LastSeen":1779025012273,"UserId":6,"l10_wins":1,"l10_losses":3},{"Name":"warlock","LastSeen":1779025012906,"UserId":2,"l10_wins":4,"l10_losses":1}],"GameName":"soccar","Port":26923,"InitTime":1779025012273,"entry_fee":21,"match_id":52,"instance_started":true,"rc_prize":34,"your_team":"red"},"for_blue":{"Players":[{"Name":"warlock3","LastSeen":1779025012273,"UserId":6,"l10_wins":1,"l10_losses":3},{"Name":"warlock","LastSeen":1779025012906,"UserId":2,"l10_wins":4,"l10_losses":1}],"GameName":"soccar","Port":26923,"InitTime":1779025012273,"entry_fee":21,"match_id":52,"instance_started":true,"rc_prize":34,"your_team":"blue"}} +[5/17/2026 7:06:53 PM] Configured dedicated match reporting for match id 52 with secret 38516e39d3406225b7c3015a66e5d25c54e9b2024c0755212122bdcea3e3a328 and internal api base https://kickkingsapi.playpoolstudios.com +[5/17/2026 7:06:53 PM] Setting cupid to load game scene +[5/17/2026 7:06:53 PM] Loading game scene +[5/17/2026 7:06:57 PM] Starting client at $kickkingsapi.playpoolstudios.com:26923 +[5/17/2026 7:06:58 PM] Client connected +[5/17/2026 7:07:03 PM] Selected team changed from Red to Blue +[5/17/2026 7:07:05 PM] Score changed from 0 to 1 +[5/17/2026 7:07:08 PM] Selected team changed from Blue to Red +[5/17/2026 7:07:13 PM] Selected team changed from Red to Blue +[5/17/2026 7:07:15 PM] Score changed from 1 to 2 +[5/17/2026 7:07:18 PM] Selected team changed from Blue to Red +[5/17/2026 7:07:34 PM] Selected team changed from Red to Blue +[5/17/2026 7:07:37 PM] Score changed from 2 to 3 +[5/17/2026 7:08:15 PM] Configured dedicated match reporting for match id 53 with secret 38516e39d3406225b7c3015a66e5d25c54e9b2024c0755212122bdcea3e3a328 and internal api base https://kickkingsapi.playpoolstudios.com +[5/17/2026 7:08:15 PM] Client disconnected +[5/17/2026 7:08:19 PM] Starting client at $kickkingsapi.playpoolstudios.com:26571 +[5/17/2026 7:08:20 PM] Client connected +[5/17/2026 7:08:26 PM] Client disconnected diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index a6f862eb..77511646 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -3911,7 +3911,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1459db1a030ce3248acd303b9ebc5425, type: 3} + m_Sprite: {fileID: 21300000, guid: eec1d4b89d2c3594b97d24a876c194f3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4126,7 +4126,7 @@ MonoBehaviour: preview: 0 isPlaying: 1 loop: 1 - currentFrame: 22 + currentFrame: 126 --- !u!1 &239916595 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 7aca0061..94b4abb1 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -808,23 +808,7 @@ public class GameManager : NetworkBehaviour // LevelLoadManager.LoadLevel("MainMenu"); } - public void Leave(string levelName = "MainMenu"){ - NetManager.MarkIntentionalClientDisconnect(); - StopClient(); - - 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); - } + public void StopClient(){ diff --git a/Assets/Scripts/GameOverCanvas.cs b/Assets/Scripts/GameOverCanvas.cs index 4ba4b0d2..a0606c1b 100644 --- a/Assets/Scripts/GameOverCanvas.cs +++ b/Assets/Scripts/GameOverCanvas.cs @@ -129,7 +129,7 @@ public class GameOverCanvas : MonoBehaviour void OnBtnLeaveGameClicked(){ - GameManager.instance.Leave(); + LevelLoadManager.instance.Leave(); } void CollectOriginalPositionsAndScales(){ @@ -333,7 +333,7 @@ public class GameOverCanvas : MonoBehaviour } - GameManager.instance.Leave(); + LevelLoadManager.instance.Leave(); } diff --git a/Assets/Scripts/NetManager.cs b/Assets/Scripts/NetManager.cs index aa69b794..941a331a 100644 --- a/Assets/Scripts/NetManager.cs +++ b/Assets/Scripts/NetManager.cs @@ -17,9 +17,11 @@ public class NetManager : NetworkManager static bool s_IntentionalClientDisconnect; + public static NetManager instance; public override void Awake() { base.Awake(); + instance = this; Transport.active.OnClientError += OnTransportClientError; } @@ -279,4 +281,5 @@ public class NetManager : NetworkManager reopenRequestInFlight = false; } + } diff --git a/Assets/Scripts/NetPlayer.cs b/Assets/Scripts/NetPlayer.cs index 96bb7ee1..f0001f3f 100644 --- a/Assets/Scripts/NetPlayer.cs +++ b/Assets/Scripts/NetPlayer.cs @@ -530,7 +530,7 @@ public class NetPlayer : NetworkBehaviour Cupid.RoomPort = branch.Port; LoginManager.SetMatchYourTeam(branch.your_team); - GameManager.instance.Leave("Game"); + LevelLoadManager.instance.Leave("Game"); } void OnRematchCancelledServer(){ diff --git a/Assets/Scripts/Utils/SceneLoad/LevelLoadManager.cs b/Assets/Scripts/Utils/SceneLoad/LevelLoadManager.cs index 792a4157..54e9835c 100644 --- a/Assets/Scripts/Utils/SceneLoad/LevelLoadManager.cs +++ b/Assets/Scripts/Utils/SceneLoad/LevelLoadManager.cs @@ -4,6 +4,7 @@ using DG.Tweening; using UnityEngine.SceneManagement; using System.Collections; using TMPro; +using Mirror; public class LevelLoadManager : MonoBehaviour { public static LevelLoadManager instance; @@ -181,4 +182,23 @@ public class LevelLoadManager : MonoBehaviour p2_l10.text = $"L10 {opponentPlayer.l10_wins}-{opponentPlayer.l10_losses}"; } + + + public void Leave(string levelName = "MainMenu"){ + NetManager.MarkIntentionalClientDisconnect(); + GameManager.instance.StopClient(); + + StartCoroutine(CoroutineWaitTillDisconnection(levelName)); + } + + IEnumerator CoroutineWaitTillDisconnection(string levelName){ + Show(); //Load the UI until the level is loaded + while(NetworkClient.isConnected){ + yield return null; + } + + yield return new WaitForSeconds(1f); //Just to make sure + + LoadLevel(levelName); + } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 247a7ca1..4e55cdcc 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -141,7 +141,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 1.12 + bundleVersion: 1.15 preloadedAssets: - {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} metroInputSource: 0