resolve conflicts

This commit is contained in:
Lucky56
2021-06-26 12:49:12 +02:00
parent 280828a06c
commit aab589ff9f

View File

@@ -63,7 +63,7 @@ class FreeplayState extends MusicBeatState
var data:Array<String> = initSonglist[i].split(':');
var meta = new SongMetadata(data[0], Std.parseInt(data[2]), data[1]);
if(Std.parseInt(data[2]) <= FlxG.save.data.weekUnlocked - 1)
songs.push(new SongMetadata(data[0], Std.parseInt(data[2]), data[1]));
{
songs.push(meta);
var format = StringTools.replace(meta.songName, " ", "-");
switch (format) {
@@ -77,7 +77,7 @@ class FreeplayState extends MusicBeatState
FreeplayState.loadDiff(2,format,meta.songName,diffs);
FreeplayState.songData.set(meta.songName,diffs);
trace('loaded diffs for ' + meta.songName);
}
}
/*