From aabc4aeb418aa7524d7419338a45832e88eaa80a Mon Sep 17 00:00:00 2001 From: willuwontu Date: Mon, 21 Mar 2022 19:46:35 -0700 Subject: [PATCH 01/10] Update .gitignore --- .gitignore | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 51bbb13..0cfec0a 100644 --- a/.gitignore +++ b/.gitignore @@ -391,4 +391,9 @@ FodyWeavers.xsd .idea/ *.sln.iml -PlayerMarkers/bin \ No newline at end of file +PlayerMarkers/bin +PickTimer/PickTimer.csproj +PickTimer/packages.config +PickTimer/PickTimer.csproj +PickTimer/PickTimer.csproj +PickTimer/PickTimer.csproj From d707c5484aae3c6b5025861467d80cf1c5426e23 Mon Sep 17 00:00:00 2001 From: willuwontu Date: Mon, 21 Mar 2022 19:49:05 -0700 Subject: [PATCH 02/10] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0cfec0a..99aace3 100644 --- a/.gitignore +++ b/.gitignore @@ -397,3 +397,4 @@ PickTimer/packages.config PickTimer/PickTimer.csproj PickTimer/PickTimer.csproj PickTimer/PickTimer.csproj +PickTimer/PickTimer.csproj From ede58229c68bbc87759068313c8d70b57dc85e55 Mon Sep 17 00:00:00 2001 From: willuwontu Date: Mon, 21 Mar 2022 20:11:27 -0700 Subject: [PATCH 03/10] Update LobbyMonitor.cs --- PickTimer/Network/LobbyMonitor.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/PickTimer/Network/LobbyMonitor.cs b/PickTimer/Network/LobbyMonitor.cs index 8304bed..c6be66b 100644 --- a/PickTimer/Network/LobbyMonitor.cs +++ b/PickTimer/Network/LobbyMonitor.cs @@ -27,6 +27,16 @@ private void Awake() // GameHook.instance.RegisterHooks(this); } + private void Start() + { + GameHook.instance.RegisterHooks(this); + } + + private void OnDestroy() + { + GameHook.instance.RemoveHooks(this); + } + private void Update() { if (!_enabled) return; From cc3f430aeac626c727eb1aaeb5e985d4b442d982 Mon Sep 17 00:00:00 2001 From: willuwontu Date: Mon, 21 Mar 2022 20:12:53 -0700 Subject: [PATCH 04/10] Update .gitignore --- .gitignore | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 99aace3..f248abe 100644 --- a/.gitignore +++ b/.gitignore @@ -391,10 +391,4 @@ FodyWeavers.xsd .idea/ *.sln.iml -PlayerMarkers/bin -PickTimer/PickTimer.csproj -PickTimer/packages.config -PickTimer/PickTimer.csproj -PickTimer/PickTimer.csproj -PickTimer/PickTimer.csproj -PickTimer/PickTimer.csproj + From 3981e06b244512fe1f794e2d5e2578c297d789d4 Mon Sep 17 00:00:00 2001 From: willuwontu Date: Mon, 21 Mar 2022 20:13:20 -0700 Subject: [PATCH 05/10] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f248abe..4962358 100644 --- a/.gitignore +++ b/.gitignore @@ -391,4 +391,4 @@ FodyWeavers.xsd .idea/ *.sln.iml - +PlayerMarkers/bin From a937c2872d8b5da346271ac2623cf985e1193055 Mon Sep 17 00:00:00 2001 From: willuwontu Date: Mon, 21 Mar 2022 20:15:14 -0700 Subject: [PATCH 06/10] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4962358..51bbb13 100644 --- a/.gitignore +++ b/.gitignore @@ -391,4 +391,4 @@ FodyWeavers.xsd .idea/ *.sln.iml -PlayerMarkers/bin +PlayerMarkers/bin \ No newline at end of file From f56c129eb0054e61b3fa13704bc2568687e5334e Mon Sep 17 00:00:00 2001 From: willuwontu Date: Mon, 21 Mar 2022 20:19:46 -0700 Subject: [PATCH 07/10] Update LobbyMonitor.cs --- PickTimer/Network/LobbyMonitor.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/PickTimer/Network/LobbyMonitor.cs b/PickTimer/Network/LobbyMonitor.cs index 73bd2ba..6855f3c 100644 --- a/PickTimer/Network/LobbyMonitor.cs +++ b/PickTimer/Network/LobbyMonitor.cs @@ -27,7 +27,6 @@ private void Awake() instance = this; InitializeLobbyTimerUi(); - GameHook.instance.RegisterHooks(this); } private void Start() @@ -35,11 +34,6 @@ private void Start() GameHook.instance.RegisterHooks(this); } - private void OnDestroy() - { - GameHook.instance.RemoveHooks(this); - } - private void Update() { if (!_enabled) return; From df341dc2267104d5c1964ccf999f9ed3f7e9da71 Mon Sep 17 00:00:00 2001 From: willuwontu Date: Mon, 21 Mar 2022 20:19:53 -0700 Subject: [PATCH 08/10] Create packages.config --- PickTimer/packages.config | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 PickTimer/packages.config diff --git a/PickTimer/packages.config b/PickTimer/packages.config new file mode 100644 index 0000000..aa28a03 --- /dev/null +++ b/PickTimer/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file From f1dbb961744499e1c2eb9c78a684459e41d8b724 Mon Sep 17 00:00:00 2001 From: willuwontu Date: Mon, 21 Mar 2022 20:20:13 -0700 Subject: [PATCH 09/10] Revert "Create packages.config" This reverts commit df341dc2267104d5c1964ccf999f9ed3f7e9da71. --- PickTimer/packages.config | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 PickTimer/packages.config diff --git a/PickTimer/packages.config b/PickTimer/packages.config deleted file mode 100644 index aa28a03..0000000 --- a/PickTimer/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file From 6c1d08adb27b3e9a4d63a2d464e0f3244a420b8a Mon Sep 17 00:00:00 2001 From: willuwontu Date: Mon, 21 Mar 2022 20:39:33 -0700 Subject: [PATCH 10/10] Update LobbyMonitor.cs --- PickTimer/Network/LobbyMonitor.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/PickTimer/Network/LobbyMonitor.cs b/PickTimer/Network/LobbyMonitor.cs index 6855f3c..d185457 100644 --- a/PickTimer/Network/LobbyMonitor.cs +++ b/PickTimer/Network/LobbyMonitor.cs @@ -89,6 +89,7 @@ private static void InitializeLobbyTimerUi() _lobbyTimerUi = Instantiate(AssetManager.TimerLobbyUI, LobbyTimerCanvas.transform, true); _lobbyTimerUi.AddComponent(); + PickTimer.Instance.ExecuteAfterFrames(1, () => _lobbyTimerUi.transform.SetAsLastSibling()); _lobbyTimerText = _lobbyTimerUi.GetComponentInChildren(); _lobbyTimerText.text = PickTimer.PickTimerTime.ToString();