juan/japanese-drum-game
1
0
Fork 0
mirror of https://github.com/jiojciojsioe3/a3cjroijsiojiorj.git synced 2024-11-15 07:21:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #114 from LoveEevee/songselect-fix-p2-importsongs

Browse Source 
SongSelect: Fix P2 working after importing songs
This commit is contained in:
Bui 2019-01-17 00:22:48 +00:00 committed by GitHub
commit 0ba9f241be
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/src/js/songselect.js
View File

@ -277,7 +277,9 @@ class SongSelect{
"shift": ["x"] "shift": ["x"]
}) })
this.startP2() if(!assets.customSongs){
this.startP2()
}
pageEvents.keyAdd(this, "all", "down", this.keyDown.bind(this)) pageEvents.keyAdd(this, "all", "down", this.keyDown.bind(this))
pageEvents.add(loader.screen, "mousemove", this.mouseMove.bind(this)) pageEvents.add(loader.screen, "mousemove", this.mouseMove.bind(this))
@ -653,7 +655,7 @@ class SongSelect{
autoplay = true autoplay = true
}else if(shift){ }else if(shift){
autoplay = shift autoplay = shift
}else{ }else if(p2.socket.readyState === 1 && !assets.customSongs){
multiplayer = ctrl multiplayer = ctrl
} }
@ -1771,12 +1773,14 @@ class SongSelect{
index = i index = i
return song.id === id return song.id === id
}) })
currentSong.p2Cursor = diffId if(currentSong){
if(p2.session && currentSong.stars){ currentSong.p2Cursor = diffId
this.selectedSong = index if(p2.session && currentSong.stars){
this.state.move = 0 this.selectedSong = index
if(this.state.screen !== "difficulty"){ this.state.move = 0
this.toSelectDifficulty(true) if(this.state.screen !== "difficulty"){
this.toSelectDifficulty(true)
}
} }
} }
} }