From a66bb9013a99c8f67b4344ce193f85aabf3f0669 Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Sat, 22 Jan 2022 17:16:48 +0800 Subject: [PATCH] =?UTF-8?q?gray=E8=83=8C=E6=99=AF=E6=94=B9=E5=90=8DfixColo?= =?UTF-8?q?r=EF=BC=8C=E5=85=81=E8=AE=B8=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/backgrounds/{gray.lua => fixColor.lua} | 8 ++++---- parts/gameFuncs.lua | 8 ++++---- parts/scenes/app_dtw.lua | 3 ++- parts/scenes/app_mahjong.lua | 2 ++ parts/scenes/app_tap.lua | 3 ++- 5 files changed, 14 insertions(+), 10 deletions(-) rename parts/backgrounds/{gray.lua => fixColor.lua} (50%) diff --git a/parts/backgrounds/gray.lua b/parts/backgrounds/fixColor.lua similarity index 50% rename from parts/backgrounds/gray.lua rename to parts/backgrounds/fixColor.lua index c9ce3ffb..5ae8b32d 100644 --- a/parts/backgrounds/gray.lua +++ b/parts/backgrounds/fixColor.lua @@ -1,11 +1,11 @@ --Customizable grey background local gc=love.graphics local back={} -local brightness=.26 +local r,g,b=.26,.26,.26 function back.draw() - gc.clear(brightness,brightness,brightness) + gc.clear(r,g,b) end -function back.event(b) - brightness=b +function back.event(_r,_g,_b) + r,g,b=_r,_g,_b end return back diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua index 49fe503b..49273112 100644 --- a/parts/gameFuncs.lua +++ b/parts/gameFuncs.lua @@ -165,8 +165,8 @@ do--function applySettings() BG.set() elseif SETTING.bg=='off'then BG.unlock() - BG.set('gray') - BG.send(SETTING.bgAlpha) + BG.set('fixColor') + BG.send(SETTING.bgAlpha,SETTING.bgAlpha,SETTING.bgAlpha) BG.lock() elseif SETTING.bg=='custom'then if love.filesystem.getInfo('conf/customBG')then @@ -184,8 +184,8 @@ do--function applySettings() else--Switch off when custom BG not found SETTING.bg='off' BG.unlock() - BG.set('gray') - BG.send(SETTING.bgAlpha) + BG.set('fixColor') + BG.send(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 8df7ea70..7ff5626a 100644 --- a/parts/scenes/app_dtw.lua +++ b/parts/scenes/app_dtw.lua @@ -199,7 +199,8 @@ local scene={} function scene.sceneInit() reset() - BG.set('gray') + BG.set('fixColor') + BG.send(.26,.26,.26) BGM.play(bgm) end diff --git a/parts/scenes/app_mahjong.lua b/parts/scenes/app_mahjong.lua index 8fa7983c..a88e8b43 100644 --- a/parts/scenes/app_mahjong.lua +++ b/parts/scenes/app_mahjong.lua @@ -86,6 +86,8 @@ end local scene={} function scene.sceneInit() + BG.set('fixColor') + BG.send(.26,.62,.26) _newGame() selected=false end diff --git a/parts/scenes/app_tap.lua b/parts/scenes/app_tap.lua index 18672284..0556e0cb 100644 --- a/parts/scenes/app_tap.lua +++ b/parts/scenes/app_tap.lua @@ -12,7 +12,8 @@ function scene.sceneInit() lastKey=nil speed=0 keyTime={}for i=1,40 do keyTime[i]=-1e99 end - BG.set('gray') + BG.set('fixColor') + BG.send(.26,.26,.26) BGM.play('push') end