瀏覽代碼

Pretty much full working again, with some visual bugs.

Halsafar 4 年之前
父節點
當前提交
83668ef45b
共有 2 個文件被更改,包括 22 次插入9 次删除
  1. 22 6
      SongBrowserPlugin/DataAccess/SongBrowserModel.cs
  2. 0 3
      SongBrowserPlugin/UI/Browser/SongBrowserUI.cs

+ 22 - 6
SongBrowserPlugin/DataAccess/SongBrowserModel.cs

@@ -327,12 +327,28 @@ namespace SongBrowser
             }
             BeatmapLevelPack levelPack = new BeatmapLevelPack(SongBrowserModel.FilteredSongsCollectionName, packName, selectedBeatmapCollection.collectionName, selectedBeatmapCollection.coverImage, new BeatmapLevelCollection(sortedSongs.ToArray()));
 
-            GameObject _noDataGO = levelCollectionViewController.GetPrivateField<GameObject>("_noDataInfoGO");
-            bool _showPlayerStatsInDetailView = navController.GetPrivateField<bool>("_showPlayerStatsInDetailView");
-            bool _showPracticeButtonInDetailView = navController.GetPrivateField<bool>("_showPracticeButtonInDetailView");
-
-            // TODO v1.12.1 - Support overwriting level pack
-            //navController.SetData(levelPack, true, _showPlayerStatsInDetailView, _showPracticeButtonInDetailView, _noDataGO);
+            /*
+             public virtual void SetData(
+                IAnnotatedBeatmapLevelCollection annotatedBeatmapLevelCollection, 
+                bool showPackHeader, bool showPlayerStats, bool showPracticeButton, 
+                string actionButtonText, 
+                GameObject noDataInfoPrefab, BeatmapDifficultyMask allowedBeatmapDifficultyMask, BeatmapCharacteristicSO[] notAllowedCharacteristics);
+            */
+            LevelCollectionNavigationController lcnvc = navController.GetPrivateField<LevelCollectionNavigationController>("_levelCollectionNavigationController");
+            var _showPlayerStatsInDetailView = navController.GetPrivateField<bool>("_showPlayerStatsInDetailView");
+            var _hidePracticeButton = navController.GetPrivateField<bool>("_hidePracticeButton");
+            var _actionButtonText = navController.GetPrivateField<string>("_actionButtonText");
+            var _allowedBeatmapDifficultyMask = navController.GetPrivateField<BeatmapDifficultyMask>("_allowedBeatmapDifficultyMask");
+            var _notAllowedCharacteristics = navController.GetPrivateField<BeatmapCharacteristicSO[]>("_notAllowedCharacteristics");
+
+            lcnvc.SetData(levelPack, 
+                true,
+                _showPlayerStatsInDetailView, 
+                !_hidePracticeButton,
+                _actionButtonText, 
+                null,
+                _allowedBeatmapDifficultyMask,
+                _notAllowedCharacteristics);
 
             //_sortedSongs.ForEach(x => Logger.Debug(x.levelID));
         }

+ 0 - 3
SongBrowserPlugin/UI/Browser/SongBrowserUI.cs

@@ -1364,9 +1364,6 @@ namespace SongBrowser.UI
         /// </summary>
         public bool UpdateLevelCollectionSelection()
         {
-            // TODO v1.12.1 - breaks
-            return false;
-
             if (_uiCreated)
             {
                 IAnnotatedBeatmapLevelCollection currentSelected = _beatUi.GetCurrentSelectedAnnotatedBeatmapLevelCollection();