diff --git a/media/music/race remix.ogg b/media/music/race remix.ogg new file mode 100644 index 00000000..b23372d7 Binary files /dev/null and b/media/music/race remix.ogg differ diff --git a/media/music/sakura.ogg b/media/music/sakura.ogg new file mode 100644 index 00000000..a59f22ca Binary files /dev/null and b/media/music/sakura.ogg differ diff --git a/parts/modes/master_ph.lua b/parts/modes/master_ph.lua index 591d9338..92a83821 100644 --- a/parts/modes/master_ph.lua +++ b/parts/modes/master_ph.lua @@ -2,7 +2,7 @@ return{ color=COLOR.black, env={ eventSet='master_ph', - bg='blockspace',bgm='super7th', + bg='blockspace',bgm='race remix', }, slowMark=true, score=function(P)return{P.result=='win'and 260 or P.modeData.pt,P.stat.time}end, diff --git a/parts/modes/netBattle.lua b/parts/modes/netBattle.lua index d39be421..51243578 100644 --- a/parts/modes/netBattle.lua +++ b/parts/modes/netBattle.lua @@ -20,6 +20,7 @@ return{ GAME.modeEnv.task=marginTask local L=TABLE.copy(netPLY.list) + print("#1:"..#L) local N=1 for i,p in next,L do if p.uid==USER.uid then @@ -38,5 +39,9 @@ return{ N=N+1 end end + print("N:"..N) + for i=1,#PLAYERS do + print("(s)id:"..PLAYERS[i].id.."("..PLAYERS[i].sid..")") + end end, } diff --git a/parts/modes/pctrain_l.lua b/parts/modes/pctrain_l.lua index 5cef881a..39560654 100644 --- a/parts/modes/pctrain_l.lua +++ b/parts/modes/pctrain_l.lua @@ -9,7 +9,7 @@ return{ freshLimit=15, RS="SRS", eventSet='pctrain_l', - bg='rgb',bgm='oxygen', + bg='rgb',bgm='memory', }, score=function(P)return{P.stat.pc,P.stat.time}end, scoreDisp=function(D)return D[1].." PCs "..STRING.time(D[2])end, diff --git a/parts/modes/pctrain_n.lua b/parts/modes/pctrain_n.lua index 62768849..4161cb26 100644 --- a/parts/modes/pctrain_n.lua +++ b/parts/modes/pctrain_n.lua @@ -8,7 +8,7 @@ return{ sequence='none', RS="SRS", eventSet='pctrain_n', - bg='rgb',bgm='oxygen', + bg='rgb',bgm='memory', }, score=function(P)return{P.stat.pc,P.stat.time}end, scoreDisp=function(D)return D[1].." PCs "..STRING.time(D[2])end, diff --git a/parts/modes/ultra.lua b/parts/modes/ultra.lua index c88bd8f6..9266cf6b 100644 --- a/parts/modes/ultra.lua +++ b/parts/modes/ultra.lua @@ -6,7 +6,7 @@ return{ drop=60,lock=60, fall=20, eventSet='ultra', - bg='fan',bgm='memory', + bg='fan',bgm='sakura', }, slowMark=true, score=function(P)return{P.stat.score}end, diff --git a/parts/scenes/music.lua b/parts/scenes/music.lua index 83e85f84..e4488b6a 100644 --- a/parts/scenes/music.lua +++ b/parts/scenes/music.lua @@ -19,6 +19,8 @@ local author={ ["how feeling"]="V.A.", ["secret7th remix"]="柒栎流星", ["jazz nihilism"]="Trebor", + ["race remix"]="柒栎流星", + ["sakura"]="ZUN & C29H25N3O5", } local scene={}