From 78033242ac4ed1115c3544eed979d0c8e53911f9 Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Sun, 8 Oct 2023 13:35:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=95=E5=AF=BC=E6=96=B0?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E6=94=B9=E9=94=AE=E4=BD=8D=20=E6=A1=86?= =?UTF-8?q?=E6=9E=B6=E8=B7=9F=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zenitha | 2 +- assets/progress.lua | 6 ++++-- assets/scene/main_in.lua | 11 +++++++++++ assets/scene/setting_in.lua | 25 ++++++++++++++++++++----- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/Zenitha b/Zenitha index eadbb06b..d5b95afc 160000 --- a/Zenitha +++ b/Zenitha @@ -1 +1 @@ -Subproject commit eadbb06b6fe913ac282cd2f1d79a49182ad8f531 +Subproject commit d5b95afc0642a5c4008dd058b85332fdf2ff71e4 diff --git a/assets/progress.lua b/assets/progress.lua index 6199a7e3..ad1ccace 100644 --- a/assets/progress.lua +++ b/assets/progress.lua @@ -6,7 +6,7 @@ local gc=love.graphics Single>=200 or Sum>=350 → III ]] local prgs=setmetatable({ - firstLaunch=true, + launchCount=0, main=1, tutorial='000000', interiorScore={ @@ -24,6 +24,8 @@ local prgs=setmetatable({ dig_practice=0, }, }, + puyo_wip=false, + gem_wip=false, },{ __index=function(_,k) error("Attempt to read undefined progress data: "..tostring(k)) @@ -118,7 +120,7 @@ function PROGRESS.load() -- MSG.new('info',"Hash not match") -- end end - prgs.firstLaunch=false + prgs.launchCount=prgs.launchCount+1 else MSG.new('info',"Load progress failed: "..res) end diff --git a/assets/scene/main_in.lua b/assets/scene/main_in.lua index 8a2e34f9..fda62f3e 100644 --- a/assets/scene/main_in.lua +++ b/assets/scene/main_in.lua @@ -1,8 +1,10 @@ local consoleClickCount=0 +local settingHint local scene={} function scene.enter() consoleClickCount=0 + settingHint=PROGRESS.get('main')<2 and PROGRESS.get('launchCount')<=3 PROGRESS.setEnv('interior') local visibleButtonName=PROGRESS.get('main')==1 and '1' or '2' for _,v in next,scene.widgetList do @@ -60,6 +62,15 @@ function scene.draw() GC.scale(2) GC.print("T",-215,-200) GC.print("echmino",-165,-200) + + -- Notify new player about setting + if settingHint then + GC.replaceTransform(SCR.xOy) + GC.setLineWidth(6) + GC.setColor(.626,1,.626,.26+.1*math.sin(2.6*love.timer.getTime())) + local W=scene.widgetList.GameSet + GC.mRect('line',W._x,W._y,W.w+42,W.h+42) + end end scene.widgetList={ diff --git a/assets/scene/setting_in.lua b/assets/scene/setting_in.lua index 5777d7f6..49c09d66 100644 --- a/assets/scene/setting_in.lua +++ b/assets/scene/setting_in.lua @@ -1,6 +1,10 @@ +local settingHint + local scene={} function scene.enter() + settingHint=PROGRESS.get('main')<2 and PROGRESS.get('launchCount')<=3 + local L=scene.widgetList if PROGRESS.get('main')==1 then L.das.y=250 @@ -26,16 +30,27 @@ function scene.keyDown(key) end end +function scene.draw() + -- Notify new player about setting + if settingHint then + GC.replaceTransform(SCR.xOy) + GC.setLineWidth(6) + GC.setColor(.626,1,.626,.26+.1*math.sin(2.6*love.timer.getTime())) + local W=scene.widgetList[MOBILE and 'setTouch' or 'setKey'] + GC.mRect('line',W._x,W._y,W.w+42,W.h+42) + end +end + local function sliderShow_time(S) return S.disp().." ms" end scene.widgetList={ {type='button', pos={0,.5},x=210,y=-360,w=200,h=80,lineWidth=4,cornerR=0,sound_trigger='button_back',fontSize=60,text=CHAR.icon.back,code=WIDGET.c_backScn('none')}, - {type='button', pos={0,.5},x=290,y=-180,w=360,h=80,lineWidth=4,cornerR=0, fontSize=40,text=LANG'setting_keymapping', code=WIDGET.c_goScn('keyset_in','none')}, - {type='checkBox', pos={0,.5},x=130,y=-60, w=40, lineWidth=4,cornerR=0,labelPos='right',fontSize=40,text=LANG'setting_enableTouching', disp=TABLE.func_getVal(SETTINGS.system,'touchControl'),code=TABLE.func_revVal(SETTINGS.system,'touchControl')}, - {type='button', pos={0,.5},x=290,y=20, w=360,h=80,lineWidth=4,cornerR=0, fontSize=40,text=LANG'setting_touching', code=WIDGET.c_goScn('keyset_touch_in','none'),visibleTick=TABLE.func_getVal(SETTINGS.system,'touchControl')}, - {type='checkBox', pos={0,.5},x=130,y=250, w=40, lineWidth=4,cornerR=0,labelPos='right',fontSize=40,text=LANG'setting_fullscreen', disp=TABLE.func_getVal(SETTINGS.system,'fullscreen'), code=TABLE.func_revVal(SETTINGS.system,'fullscreen')}, - {type='checkBox', pos={0,.5},x=130,y=350, w=40, lineWidth=4,cornerR=0,labelPos='right',fontSize=40,text=LANG'setting_autoMute', disp=TABLE.func_getVal(SETTINGS.system,'autoMute'), code=TABLE.func_revVal(SETTINGS.system,'autoMute')}, + {type='button', name='setKey',pos={0,.5},x=290,y=-180,w=360,h=80, lineWidth=4,cornerR=0, fontSize=40,text=LANG'setting_keymapping', code=WIDGET.c_goScn('keyset_in','none')}, + {type='checkBox', pos={0,.5},x=130,y=-60, w=40, lineWidth=4,cornerR=0,labelPos='right',fontSize=40,text=LANG'setting_enableTouching', disp=TABLE.func_getVal(SETTINGS.system,'touchControl'),code=TABLE.func_revVal(SETTINGS.system,'touchControl')}, + {type='button', name='setTouch',pos={0,.5},x=290,y=20, w=360,h=80,lineWidth=4,cornerR=0, fontSize=40,text=LANG'setting_touching', code=WIDGET.c_goScn('keyset_touch_in','none'),visibleTick=TABLE.func_getVal(SETTINGS.system,'touchControl')}, + {type='checkBox', pos={0,.5},x=130,y=250, w=40, lineWidth=4,cornerR=0,labelPos='right',fontSize=40,text=LANG'setting_fullscreen', disp=TABLE.func_getVal(SETTINGS.system,'fullscreen'), code=TABLE.func_revVal(SETTINGS.system,'fullscreen')}, + {type='checkBox', pos={0,.5},x=130,y=350, w=40, lineWidth=4,cornerR=0,labelPos='right',fontSize=40,text=LANG'setting_autoMute', disp=TABLE.func_getVal(SETTINGS.system,'autoMute'), code=TABLE.func_revVal(SETTINGS.system,'autoMute')}, {type='slider', pos={1,.5},x=-550, y=-370,w=400,fontSize=40,text=LANG'setting_mainVol',widthLimit=260,disp=TABLE.func_getVal(SETTINGS.system,'mainVol'),code=TABLE.func_setVal(SETTINGS.system,'mainVol')}, {type='slider', pos={1,.5},x=-550, y=-290,w=400,fontSize=40,text=LANG'setting_bgm', widthLimit=260,disp=TABLE.func_getVal(SETTINGS.system,'bgmVol'), code=TABLE.func_setVal(SETTINGS.system,'bgmVol')},