diff --git a/Zframework/widgetList.lua b/Zframework/widgetList.lua index 7d14f819..fb90e89b 100644 --- a/Zframework/widgetList.lua +++ b/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")}), + newButton({name="up", x=1100, y=200, 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="down", x=1100, y=480, w=120, color="white", font=55,code=pressKey("down")}), + 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="back", x=1140, y=640, w=180,h=80, color="white", font=35,code=BACK}), }, custom={ @@ -471,7 +471,7 @@ local Widgets={ }, p15={ newButton({name="reset", x=160,y=100,w=180,h=100,color="lGreen", font=40,code=pressKey("space")}), - newSlider({name="color", x=110,y=250,w=170,unit=4,show=false, font=30,disp=function()return sceneTemp.color end,code=function(v)if sceneTemp.state==0 then sceneTemp.color=v end end,hide=function()return sceneTemp.state==1 end}), + newSlider({name="color", x=110,y=250,w=170,unit=4,show=false, font=30,disp=function()return sceneTemp.color end,code=function(v)if sceneTemp.state==0 then sceneTemp.color=v end end,hide=function()return sceneTemp.state==1 end}), newSwitch({name="blind", x=240,y=330,w=60, font=40,disp=function()return sceneTemp.blind end,code=pressKey("b"),hide=function()return sceneTemp.state==1 end}), newSwitch({name="slide", x=240,y=420,w=60, font=40,disp=function()return sceneTemp.slide end,code=pressKey("s"),hide=function()return sceneTemp.state==1 end}), newSwitch({name="pathVis", x=240,y=510,w=60, font=40,disp=function()return sceneTemp.pathVis end,code=pressKey("p"),hide=function()return sceneTemp.state==1 or not sceneTemp.slide end}), diff --git a/parts/list.lua b/parts/list.lua index 9426b8a9..dc98cac9 100644 --- a/parts/list.lua +++ b/parts/list.lua @@ -224,7 +224,7 @@ drawableText={ preview=T(40), keyboard=T(25),joystick=T(25), ctrlSetHelp=T(30), - musicRoom=T(80),nowPlaying=T(50), + musicRoom=T(80),nowPlaying=T(60), VKTchW=T(30),VKOrgW=T(30),VKCurW=T(30), noScore=T(45),highScore=T(30), } \ No newline at end of file diff --git a/parts/scenes.lua b/parts/scenes.lua index 6dcddf94..f0a0c3a2 100644 --- a/parts/scenes.lua +++ b/parts/scenes.lua @@ -464,7 +464,7 @@ do--schulte_G target=0, } end - + local function newBoard() local S=sceneTemp local L={} @@ -543,7 +543,7 @@ do--schulte_G S.time=Timer()-S.startTime+S.error end end - + local fontSize={nil,nil,120,100,80,60} function Pnt.schulte_G() local S=sceneTemp @@ -1191,9 +1191,9 @@ do--music end function keyDown.music(key) if key=="down"then - sceneTemp=sceneTemp%BGM.len+1 + sceneTemp=min(sceneTemp+1,BGM.len) elseif key=="up"then - sceneTemp=(sceneTemp-2)%BGM.len+1 + sceneTemp=max(sceneTemp-1,1) elseif key=="return"or key=="space"then if BGM.nowPlay~=BGM.list[sceneTemp]then SFX.play("click") @@ -1207,24 +1207,32 @@ do--music end function Pnt.music() - gc.setColor(1,1,1,.3+sin(Timer()*5)*.2) - gc.rectangle("fill",45,98+30*sceneTemp,250,30) - gc.setColor(.7,.7,.7)gc.draw(drawableText.musicRoom,20,20) - gc.setColor(1,1,1)gc.draw(drawableText.musicRoom,22,23) - gc.draw(drawableText.nowPlaying,490,390) + gc.setColor(.7,.7,.7) + gc.draw(drawableText.musicRoom,20,20) + gc.setColor(1,1,1) + gc.draw(drawableText.musicRoom,22,23) + + setFont(55) + gc.printf(BGM.list[sceneTemp],500,300,500,"right") setFont(30) - for i=1,BGM.len do - gc.print(BGM.list[i],50,90+30*i) + if sceneTemp>1 then + gc.printf(BGM.list[sceneTemp-1],500,270,500,"right") end - gc.draw(IMG.title,640,310,nil,1.5,nil,206,35) + if sceneTemp