From 604cabf0ba14b8de0cce9a13e0d47ef7c864b88e Mon Sep 17 00:00:00 2001 From: Maxime Cauvin Date: Wed, 12 Feb 2020 18:24:36 +0100 Subject: [PATCH] fix/master: BeatSaberDownloader was broken so I feex it --- ImageCoverExpander/Plugin.cs | 16 +++++++++++----- ImageCoverExpander/Properties/AssemblyInfo.cs | 4 ++-- ImageCoverExpander/manifest.json | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ImageCoverExpander/Plugin.cs b/ImageCoverExpander/Plugin.cs index 1d932e6..4dffa23 100644 --- a/ImageCoverExpander/Plugin.cs +++ b/ImageCoverExpander/Plugin.cs @@ -61,6 +61,13 @@ private static void RefreshButtonsBackgrounds(Component bdscc) where T : Segm } private static void OnMenuSceneLoadedFresh() + { + var mmvc = Resources.FindObjectsOfTypeAll().FirstOrDefault(); + if (!mmvc) return; + mmvc.didFinishEvent += OnDidFinishEvent; + } + + private static void OnDidFinishEvent(MainMenuViewController mmvc, MainMenuViewController.MenuButton _) { var sldvc = Resources.FindObjectsOfTypeAll().FirstOrDefault(); var ldvc = Resources.FindObjectsOfTypeAll().FirstOrDefault(); @@ -68,10 +75,8 @@ private static void OnMenuSceneLoadedFresh() var bcscc = ReflectionUtil.GetPrivateField(ldvc, "_beatmapCharacteristicSegmentedControlController"); var bdscc = ReflectionUtil.GetPrivateField(ldvc, "_beatmapDifficultySegmentedControlController"); if (!bcscc || !bdscc) return; - sldvc.didPresentContentEvent += (controller, type) => { - bcscc.didSelectBeatmapCharacteristicEvent += (controlController, so) => { - RefreshButtonsBackgrounds(bdscc); - }; + sldvc.didPresentContentEvent += (sldvcController, type) => { + bcscc.didSelectBeatmapCharacteristicEvent += (controlController, so) => { RefreshButtonsBackgrounds(bdscc); }; RefreshButtonsBackgrounds(bcscc); RefreshButtonsBackgrounds(bdscc); }; @@ -81,7 +86,7 @@ private static void OnMenuSceneLoadedFresh() var pscLayout = playerStatsContainer.GetComponent(); var playContainer = bdscc.transform.parent; var levelInfoLayout = levelInfo.GetComponent(); - if (!coverImage || !levelInfo || ! playerStatsContainer || !pscLayout || !playContainer || !levelInfoLayout) return; + if (!coverImage || !levelInfo || !playerStatsContainer || !pscLayout || !playContainer || !levelInfoLayout) return; coverImage.transform.localPosition = new Vector3(0, 0, coverImage.transform.localPosition.z); coverImage.transform.localScale = Vector3.one; coverImage.GetComponent().sizeDelta = new Vector2(11, 11); @@ -95,6 +100,7 @@ private static void OnMenuSceneLoadedFresh() pscLayout.transform.SetParent(levelInfo); pscLayout.transform.localPosition = new Vector3(0, -10); levelInfoLayout.preferredHeight = 60; + mmvc.didFinishEvent -= OnDidFinishEvent; } public void OnApplicationStart() { } diff --git a/ImageCoverExpander/Properties/AssemblyInfo.cs b/ImageCoverExpander/Properties/AssemblyInfo.cs index 2bcdc6c..2384894 100644 --- a/ImageCoverExpander/Properties/AssemblyInfo.cs +++ b/ImageCoverExpander/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0")] -[assembly: AssemblyFileVersion("1.0.0")] +[assembly: AssemblyVersion("1.0.1")] +[assembly: AssemblyFileVersion("1.0.1")] diff --git a/ImageCoverExpander/manifest.json b/ImageCoverExpander/manifest.json index ee01983..2c660c5 100644 --- a/ImageCoverExpander/manifest.json +++ b/ImageCoverExpander/manifest.json @@ -5,7 +5,7 @@ "gameVersion": "1.7.0", "id": "ImageCoverExpander", "name": "ImageCoverExpander", - "version": "1.0.0", + "version": "1.0.1", "dependsOn": { "BS Utils": "^1.4.1" },