音乐室再装修

Zframework/widgetList.lua

@@ -142,9 +142,9 @@ local Widgets={
 	},
 	music={
 		newSlider({name="bgm",		x=760,	y=80,	w=400,							font=35,disp=SETval("bgm"),code=function(v)setting.bgm=v;BGM.freshVolume()end}),
-		newButton({name="up",		x=1100,	y=200,	w=120,			color="white",	font=55,code=pressKey("up"),hide=function()return sceneTemp==1 end}),
+		newButton({name="up",		x=200,	y=250,	w=120,			color="white",	font=55,code=pressKey("up"),hide=function()return sceneTemp==1 end}),
-		newButton({name="play",		x=1100,	y=340,	w=120,			color="white",	font=35,code=pressKey("space"),hide=function()return setting.bgm==0 end}),
+		newButton({name="play",		x=200,	y=390,	w=120,			color="white",	font=35,code=pressKey("space"),hide=function()return setting.bgm==0 end}),
-		newButton({name="down",		x=1100,	y=480,	w=120,			color="white",	font=55,code=pressKey("down"),hide=function()return sceneTemp==BGM.len end}),
+		newButton({name="down",		x=200,	y=530,	w=120,			color="white",	font=55,code=pressKey("down"),hide=function()return sceneTemp==BGM.len end}),
 		newButton({name="back",		x=1140,	y=640,	w=180,h=80,		color="white",	font=35,code=BACK}),
 	},
 	custom={

parts/list.lua

@@ -191,7 +191,9 @@ customRange={
 local function T(s,t)return love.graphics.newText(setFont(s),t)end
 drawableText={
 	question=T(100,"?"),
+	right=T(45,"→"),
 	bpm=T(15,"BPM"),kpm=T(15,"KPM"),
+
 	speedLV=T(20,"speed level"),
 	atk=T(20,"Attack"),
 	eff=T(20,"Efficiency"),
@@ -224,7 +226,7 @@ drawableText={
 	preview=T(40),
 	keyboard=T(25),joystick=T(25),
 	ctrlSetHelp=T(30),
-	musicRoom=T(80),nowPlaying=T(60),
+	musicRoom=T(80),nowPlaying=T(50),
 	VKTchW=T(30),VKOrgW=T(30),VKCurW=T(30),
 	noScore=T(45),highScore=T(30),
 }

parts/scenes.lua

@@ -1190,14 +1190,23 @@ do--music
 		wheelScroll(y)
 	end
 	function keyDown.music(key)
+		local S=sceneTemp
 		if key=="down"then
-				sceneTemp=min(sceneTemp+1,BGM.len)
+			if S<BGM.len then
+				sceneTemp=S+1
+				SFX.play("move",.7)
+			end
 		elseif key=="up"then
-			sceneTemp=max(sceneTemp-1,1)
+			if S>1 then
+				sceneTemp=S-1
+				SFX.play("move",.7)
+			end
 		elseif key=="return"or key=="space"then
-			if BGM.nowPlay~=BGM.list[sceneTemp]then
+			if BGM.nowPlay~=BGM.list[S]then
-				SFX.play("click")
+				if setting.bgm>0 then
-				BGM.play(BGM.list[sceneTemp])
+					SFX.play("click")
+					BGM.play(BGM.list[S])
+				end
 			else
 				BGM.stop()
 			end
@@ -1212,27 +1221,27 @@ do--music
 		gc.setColor(1,1,1)
 		gc.draw(drawableText.musicRoom,22,23)
 
-		setFont(55)
+		gc.draw(drawableText.right,270,350+10)
-		gc.printf(BGM.list[sceneTemp],500,300,500,"right")
+		setFont(50)
-		setFont(30)
+		gc.print(BGM.list[sceneTemp],320,350+5)
-		if sceneTemp>1 then
+		setFont(35)
-			gc.printf(BGM.list[sceneTemp-1],500,270,500,"right")
+		if sceneTemp>1 then			gc.print(BGM.list[sceneTemp-1],320,350-30)end
-		end
+		if sceneTemp<BGM.len then	gc.print(BGM.list[sceneTemp+1],320,350+65)end
-		if sceneTemp<BGM.len then
+		setFont(20)
-			gc.printf(BGM.list[sceneTemp+1],500,370,500,"right")
+		if sceneTemp>2 then			gc.print(BGM.list[sceneTemp-2],320,350-50)end
-		end
+		if sceneTemp<BGM.len-1 then	gc.print(BGM.list[sceneTemp+2],320,350+110)end
 
-		gc.draw(IMG.title,500,610,nil,1.5,nil,206,35)
+		gc.draw(IMG.title,840,220,nil,1.5,nil,206,35)
 		if BGM.nowPlay then
-			gc.draw(drawableText.nowPlaying,490-drawableText.nowPlaying:getWidth(),450)
+			gc.draw(drawableText.nowPlaying,700-drawableText.nowPlaying:getWidth(),500)
-			setFont(60)
+			setFont(50)
 			gc.setColor(sin(Timer()*.5)*.2+.8,sin(Timer()*.7)*.2+.8,sin(Timer())*.2+.8)
-			gc.print(BGM.nowPlay,500,450)
+			gc.print(BGM.nowPlay,710,500)
 
 			local t=-Timer()%2.3/2
 			if t<1 then
 				gc.setColor(1,1,1,t)
-				gc.draw(IMG.title_color,500,610,nil,1.5+.1-.1*t,1.5+.3-.3*t,206,35)
+				gc.draw(IMG.title_color,840,220,nil,1.5+.1-.1*t,1.5+.3-.3*t,206,35)
 			end
 		end
 	end