diff --git a/Zframework b/Zframework index a91c3d67..559a8a46 160000 --- a/Zframework +++ b/Zframework @@ -1 +1 @@ -Subproject commit a91c3d67f23a3b06ca38352b864fbd85b4dca6ac +Subproject commit 559a8a46a79af57893224a2497d3c249dab88025 diff --git a/main.lua b/main.lua index ecf361de..863f7056 100644 --- a/main.lua +++ b/main.lua @@ -180,7 +180,7 @@ Z.setOnFnKeys({ end end end, - function()print(WIDGET.getSelected()or"no widget selected")end, + function()print(BG.locked)end, function()for k,v in next,_G do print(k,v)end end, function()if love['_openConsole']then love['_openConsole']()end end, }) diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua index d3bfadb5..8c847625 100644 --- a/parts/gameFuncs.lua +++ b/parts/gameFuncs.lua @@ -165,17 +165,15 @@ do--function applySettings() BG.set() elseif SETTING.bg=='off'then BG.unlock() - BG.set('fixColor') - BG.send(SETTING.bgAlpha,SETTING.bgAlpha,SETTING.bgAlpha) + BG.set('fixColor',SETTING.bgAlpha,SETTING.bgAlpha,SETTING.bgAlpha) BG.lock() elseif SETTING.bg=='custom'then if love.filesystem.getInfo('conf/customBG')then local res,image=pcall(gc.newImage,love.filesystem.newFile('conf/customBG')) if res then BG.unlock() - BG.set('custom') gc.setDefaultFilter('linear','linear') - BG.send(SETTING.bgAlpha,image) + BG.set('custom',SETTING.bgAlpha,image) gc.setDefaultFilter('nearest','nearest') BG.lock() else @@ -184,8 +182,7 @@ do--function applySettings() else--Switch off when custom BG not found SETTING.bg='off' BG.unlock() - BG.set('fixColor') - BG.send(SETTING.bgAlpha,SETTING.bgAlpha,SETTING.bgAlpha) + BG.set('fixColor',SETTING.bgAlpha,SETTING.bgAlpha,SETTING.bgAlpha) BG.lock() end end diff --git a/parts/scenes/app_dtw.lua b/parts/scenes/app_dtw.lua index 7ff5626a..97f36d96 100644 --- a/parts/scenes/app_dtw.lua +++ b/parts/scenes/app_dtw.lua @@ -199,8 +199,7 @@ local scene={} function scene.sceneInit() reset() - BG.set('fixColor') - BG.send(.26,.26,.26) + BG.set('fixColor',.26,.26,.26) BGM.play(bgm) end diff --git a/parts/scenes/app_mahjong.lua b/parts/scenes/app_mahjong.lua index a25eb008..1b7e625c 100644 --- a/parts/scenes/app_mahjong.lua +++ b/parts/scenes/app_mahjong.lua @@ -106,8 +106,7 @@ end local scene={} function scene.sceneInit() - BG.set('fixColor') - BG.send(.26,.62,.26) + BG.set('fixColor',.26,.62,.26) _newGame() selected=false end diff --git a/parts/scenes/app_tap.lua b/parts/scenes/app_tap.lua index 0556e0cb..81b0bcc1 100644 --- a/parts/scenes/app_tap.lua +++ b/parts/scenes/app_tap.lua @@ -12,8 +12,7 @@ function scene.sceneInit() lastKey=nil speed=0 keyTime={}for i=1,40 do keyTime[i]=-1e99 end - BG.set('fixColor') - BG.send(.26,.26,.26) + BG.set('fixColor',.26,.26,.26) BGM.play('push') end diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index 0bf9d95c..5734c3f6 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -97,7 +97,14 @@ scene.widgetList={ }, WIDGET.newSlider{name='bgAlpha', x=1020,y=1430,w=200, axis={0,.8},disp=SETval('bgAlpha'), - code=function(v)SETTING.bgAlpha=v BG.send(v,v,v)end, + code=function(v) + SETTING.bgAlpha=v + if BG.cur=='fixColor' then + BG.send(v,v,v) + else + BG.send(v) + end + end, hideF=function()return SETTING.bg=='on'end },