From 53fb02b4db5b15ec608fa05fe382a3cf2908493f Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Mon, 7 Jun 2021 14:53:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/light/init.lua | 2 +- parts/gametoolfunc.lua | 2 +- parts/scenes/error.lua | 2 +- parts/scenes/setting_game.lua | 2 +- parts/scenes/setting_sound.lua | 6 +++--- parts/users.lua | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Zframework/light/init.lua b/Zframework/light/init.lua index a99d413a..c57a8b7f 100644 --- a/Zframework/light/init.lua +++ b/Zframework/light/init.lua @@ -77,7 +77,7 @@ function LIGHT.add(x,y,radius,solidFunc) blackCanvas=gc.newCanvas(radius,radius),--Solid canvas shadowCanvas=gc.newCanvas(radius,1),--1D vis-depth canvas renderCanvas=gc.newCanvas(radius,radius),--Light canvas - blackFn=solidFunc,--Solid draw funcion + blackFn=solidFunc,--Solid draw function move=move, setPow=setPow, diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index de29d608..484f304d 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -543,7 +543,7 @@ do--function checkWarning() GAME.warnLVL=max(GAME.warnLVL-.026,0) end if GAME.warnLVL>1.126 and P1.frameRun%30==0 then - SFX.fplay("warning",SETTING.sfx_warn) + SFX.fplay('warning',SETTING.sfx_warn) end end end diff --git a/parts/scenes/error.lua b/parts/scenes/error.lua index dda2849d..acb65594 100644 --- a/parts/scenes/error.lua +++ b/parts/scenes/error.lua @@ -16,7 +16,7 @@ function scene.sceneInit() NET.wsclose_user() NET.wsclose_play() NET.wsclose_stream() - if SETTING then SFX.fplay("error",SETTING.voc*.8 or 0)end + if SETTING then SFX.fplay('error',SETTING.voc*.8 or 0)end end function scene.draw() diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 9d98bcb6..b9acac07 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -29,7 +29,7 @@ scene.widgetList={ WIDGET.newButton{name="touch", x=990, y=220, w=320,h=80, color='lB',font=35,code=goScene'setting_touch'}, WIDGET.newSlider{name="reTime", x=330, y=320, w=300,unit=10,disp=SETval("reTime"),code=SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end}, WIDGET.newSelector{name="RS", x=300, y=420, w=300,color='S',list={'TRS','SRS','C2','C2sym','Classic','None'},disp=SETval("RS"),code=SETsto("RS")}, - WIDGET.newButton{name="layout", x=250, y=540, w=200,h=70,font=35, code=goScene'setting_skin'}, + WIDGET.newButton{name="layout", x=250, y=540, w=200,h=70,font=35, code=goScene'setting_skin'}, WIDGET.newSwitch{name="autoPause", x=1060, y=310, disp=SETval("autoPause"), code=SETrev("autoPause")}, WIDGET.newSwitch{name="swap", x=1060, y=370, disp=SETval("swap"), code=SETrev("swap")}, WIDGET.newSwitch{name="fine", x=1060, y=430, disp=SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play('finesseError',.6)end end}, diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index 6f8501a1..68720461 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -72,9 +72,9 @@ scene.widgetList={ WIDGET.newSlider{name="bgm", x=300, y=190,w=420, disp=SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, WIDGET.newSlider{name="sfx", x=300, y=260,w=420, change=function()SFX.play('blip_1')end,disp=SETval("sfx"),code=SETsto("sfx")}, WIDGET.newSlider{name="stereo", x=300, y=330,w=420, change=function()SFX.play('move',1,-1)SFX.play('lock',1,1)end,disp=SETval("stereo"),code=SETsto("stereo"),hideF=function()return SETTING.sx==0 end}, - WIDGET.newSlider{name="spawn", x=300, y=400,w=420, change=function()SFX.fplay("spawn_"..math.random(7),SETTING.sfx_spawn)end,disp=SETval("sfx_spawn"),code=SETsto("sfx_spawn")}, - WIDGET.newSlider{name='warn', x=300, y=470,w=420, change=function()SFX.fplay("warning",SETTING.sfx_warn)end,disp=SETval("sfx_warn"),code=SETsto("sfx_warn")}, - WIDGET.newSlider{name="vib", x=300, y=540,w=420,unit=10, change=function()VIB(2)end,disp=SETval("vib"),code=SETsto("vib")}, + WIDGET.newSlider{name="spawn", x=300, y=400,w=420, change=function()SFX.fplay('spawn_'..math.random(7),SETTING.sfx_spawn)end,disp=SETval("sfx_spawn"),code=SETsto("sfx_spawn")}, + WIDGET.newSlider{name="warn", x=300, y=470,w=420, change=function()SFX.fplay('warning',SETTING.sfx_warn)end,disp=SETval("sfx_warn"),code=SETsto("sfx_warn")}, + WIDGET.newSlider{name="vib", x=300, y=540,w=420,unit=10,change=function()VIB(2)end,disp=SETval("vib"),code=SETsto("vib")}, WIDGET.newSlider{name="voc", x=300, y=610,w=420, change=function()VOC.play('test')end,disp=SETval("voc"),code=SETsto("voc")}, WIDGET.newSelector{name="cv", x=1100, y=380,w=200, list={'miya','naki'},disp=function()return cv end,code=function(i)cv=i end}, WIDGET.newButton{name="apply", x=1100, y=460,w=180,h=80, code=function()SETTING.cv=cv VOC.loadAll()end,hideF=function()return SETTING.cv==cv end}, diff --git a/parts/users.lua b/parts/users.lua index 1632af8c..567c9dd5 100644 --- a/parts/users.lua +++ b/parts/users.lua @@ -13,7 +13,7 @@ local function loadAvatar(path) end local emptyUser={ - username="_Stacker", + username="Stacker", motto="", hash="", new=false,