File tree Expand file tree Collapse file tree 2 files changed +5
-14
lines changed
Expand file tree Collapse file tree 2 files changed +5
-14
lines changed Original file line number Diff line number Diff line change @@ -434,9 +434,11 @@ public static void BuildDashStructures() {
434434 ConcurrentBag < MuseDashSong > workSongs = [ ] ;
435435 using ( StaticSequentialProfiler . StartStackFrame ( "Parallel Process Dash Structures" ) )
436436 Parallel . ForEach ( Albums , ( album ) => {
437- var songs = Filesystem . ReadJSON < List < MuseDashSongInfoJSON > > ( "musedash" , $ "Assets/Static Resources/Data/Configs/others/{ album . JsonName } ") ;
438- var songsEN = Filesystem . ReadJSON < __musedashSong [ ] > ( "musedash" , $ "Assets/Static Resources/Data/Configs/english/{ album . JsonName } _English") ;
439- Debug . Assert ( songs . Count == songsEN . Length ) ;
437+ // var songs_raw = filesystem.ReadAllText("musedash", $"Assets/Static Resources/Data/Configs/others/{album.JsonName}.json");
438+ // var songsEN_raw = filesystem.ReadAllText("musedash", $"Assets/Static Resources/Data/Configs/english/{album.JsonName}_English.json");
439+ var songs = Filesystem . ReadJSON < List < MuseDashSongInfoJSON > > ( "musedash" , $ "Assets/Static Resources/Data/Configs/others/{ album . JsonName } .json") ;
440+ var songsEN = Filesystem . ReadJSON < __musedashSong [ ] > ( "musedash" , $ "Assets/Static Resources/Data/Configs/english/{ album . JsonName } _English.json") ;
441+ // Debug.Assert(songs.Count == songsEN.Length);
440442 // if (songs.Count != songsEN.Length) {
441443 // Logs.Print($"inconsistency: {album.JsonName} songs length! songs ({songs.Count}) != songsEN ({songsEN.Length})");
442444 // for (int i = 0; i < songs.Count; i++) Logs.Print($" song #{i}: {songs[i].Name}");
Original file line number Diff line number Diff line change @@ -156,17 +156,6 @@ public UnityFile GetBundleNameFromFullPath(string path) {
156156 if ( LookupAbsFiles . TryGetValue ( path , out var bundleInfo ) ) return bundleInfo ;
157157 if ( LookupAbsFolders . TryGetValue ( path , out var folder ) ) return folder . Single ( ) ;
158158
159- // More expensive lookup method.
160- // todo: cheapen this with local searching or something
161-
162- var tryFind = LookupAbsFiles . FirstOrDefault ( x => x . Key . StartsWith ( path ) ) . Value ?? LookupAbsFiles . FirstOrDefault ( x => x . Key . EndsWith ( path ) ) . Value ;
163- if ( tryFind == null ) {
164- var tryFind2 = LookupAbsFolders . FirstOrDefault ( x => x . Key . StartsWith ( path ) ) . Value ;
165- if ( tryFind2 != null )
166- return tryFind2 . Single ( ) ;
167- }
168- else return tryFind ;
169-
170159 throw new FileNotFoundException ( path ) ;
171160 }
172161
You can’t perform that action at this time.
0 commit comments