SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支持加载部分老版本存档，软件锁界面出现时机调整，按钮位置调整

Browse Source
This commit is contained in:
MrZ_26
2020-08-16 21:01:34 +08:00
parent b2ba8a84e9
commit 2cf64541f2
5 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Zframework/init.lua
View File

@@ -173,10 +173,12 @@ function keyDown.calculator(k)
if S.val==626 then if S.val==626 then
S.pass=true S.pass=true
elseif S.val==196022 then elseif S.val==196022 then
S.pass=true
marking=nil marking=nil
TEXT.show("\68\69\86\58\87\97\116\101\114\109\97\114\107\32\82\101\109\111\118\101\100",640,360,60,"stretch",.6) TEXT.show("\68\69\86\58\87\97\116\101\114\109\97\114\107\32\82\101\109\111\118\101\100",640,360,60,"stretch",.6)
SFX.play("clear") SFX.play("clear")
elseif S.val==72943816 then elseif S.val==72943816 then
S.pass=true
for name,M in next,Modes do for name,M in next,Modes do
if not modeRanks[name]then if not modeRanks[name]then
modeRanks[name]=M.score and 0 or 6 modeRanks[name]=M.score and 0 or 6
@@ -191,7 +193,7 @@ function keyDown.calculator(k)
end end
elseif k=="space"then elseif k=="space"then
if S.pass then if S.pass then
SCN.swapTo("load") SCN.swapTo("intro")
end end
end end
end end
@@ -217,6 +219,10 @@ function mouseDown.intro(x,y,k)
if k==2 then if k==2 then
VOC.play("bye") VOC.play("bye")
SCN.back() SCN.back()
elseif newVersionLaunch then
SCN.push("main","fade")
SCN.swapTo("history","fade")
TEXT.show(text.newVersion,640,200,30,"fly",.3)
else else
SCN.go("main") SCN.go("main")
end end
@@ -1094,7 +1100,7 @@ function love.run()
local FCT=0--Framedraw counter local FCT=0--Framedraw counter
love.resize(gc.getWidth(),gc.getHeight()) love.resize(gc.getWidth(),gc.getHeight())
SCN.init(setting.appLock and "calculator"or"load")--Scene Launch SCN.init("load")--Scene Launch
marking=true marking=true
return function() return function()

14
Zframework/paint.lua
View File

@@ -111,13 +111,15 @@ function Pnt.load()
gc.rectangle("fill",300,330,S.cur/S.tar*680,60,5) gc.rectangle("fill",300,330,S.cur/S.tar*680,60,5)
gc.setColor(1,1,1) gc.setColor(1,1,1)
gc.rectangle("line",300,330,680,60,5) gc.rectangle("line",300,330,680,60,5)
setFont(35) if not setting.appLock then
gc.print(text.load[S.phase],340,335) setFont(35)
if S.phase~=0 then gc.print(text.load[S.phase],340,335)
gc.printf(S.cur.."/"..S.tar,795,335,150,"right") if S.phase~=0 then
gc.printf(S.cur.."/"..S.tar,795,335,150,"right")
end
setFont(25)
mStr(S.tip,640,400)
end end
setFont(25)
mStr(S.tip,640,400)
end end
local titleTransform={ local titleTransform={

13
Zframework/timer.lua
View File

@@ -39,18 +39,15 @@ function Tmr.load()
SKIN.load() SKIN.load()
stat.run=stat.run+1 stat.run=stat.run+1
-------------------------- --------------------------
SFX.play("welcome_sfx") if not setting.appLock then
VOC.play("welcome") SFX.play("welcome_sfx")
VOC.play("welcome")
end
else else
S.cur=S.cur+1 S.cur=S.cur+1
S.tar=S.cur S.tar=S.cur
if S.cur>62.6 then if S.cur>62.6 then
if newVersionLaunch then SCN.swapTo(setting.appLock and "calculator"or"intro","none")
SCN.push("intro","fade")
SCN.swapTo("history","fade")
else
SCN.swapTo("intro","none")
end
end end
loadingFinished=true loadingFinished=true
return return

34
Zframework/widgetList.lua
View File

@@ -99,23 +99,23 @@ newSlider=WIDGET.newSlider
local Widgets={ local Widgets={
load={},intro={},quit={}, load={},intro={},quit={},
calculator={ calculator={
newKey({name="_1", x=300,y=300,w=90,h=90, color="white", font=50,code=pressKey("1")}), newKey({name="_1", x=150,y=300,w=90,h=90, color="white", font=50,code=pressKey("1")}),
newKey({name="_2", x=400,y=300,w=90,h=90, color="white", font=50,code=pressKey("2")}), newKey({name="_2", x=250,y=300,w=90,h=90, color="white", font=50,code=pressKey("2")}),
newKey({name="_3", x=500,y=300,w=90,h=90, color="white", font=50,code=pressKey("3")}), newKey({name="_3", x=350,y=300,w=90,h=90, color="white", font=50,code=pressKey("3")}),
newKey({name="_4", x=300,y=400,w=90,h=90, color="white", font=50,code=pressKey("4")}), newKey({name="_4", x=150,y=400,w=90,h=90, color="white", font=50,code=pressKey("4")}),
newKey({name="_5", x=400,y=400,w=90,h=90, color="white", font=50,code=pressKey("5")}), newKey({name="_5", x=250,y=400,w=90,h=90, color="white", font=50,code=pressKey("5")}),
newKey({name="_6", x=500,y=400,w=90,h=90, color="white", font=50,code=pressKey("6")}), newKey({name="_6", x=350,y=400,w=90,h=90, color="white", font=50,code=pressKey("6")}),
newKey({name="_7", x=300,y=500,w=90,h=90, color="white", font=50,code=pressKey("7")}), newKey({name="_7", x=150,y=500,w=90,h=90, color="white", font=50,code=pressKey("7")}),
newKey({name="_8", x=400,y=500,w=90,h=90, color="white", font=50,code=pressKey("8")}), newKey({name="_8", x=250,y=500,w=90,h=90, color="white", font=50,code=pressKey("8")}),
newKey({name="_9", x=500,y=500,w=90,h=90, color="white", font=50,code=pressKey("9")}), newKey({name="_9", x=350,y=500,w=90,h=90, color="white", font=50,code=pressKey("9")}),
newKey({name="_0", x=300,y=600,w=90,h=90, color="white", font=50,code=pressKey("0")}), newKey({name="_0", x=150,y=600,w=90,h=90, color="white", font=50,code=pressKey("0")}),
newKey({name="<", x=400,y=600,w=90,h=90, color="lRed", font=50,code=pressKey("backspace")}), newKey({name="<", x=250,y=600,w=90,h=90, color="lRed", font=50,code=pressKey("backspace")}),
newKey({name="=", x=500,y=600,w=90,h=90, color="lYellow",font=50,code=pressKey("return")}), newKey({name="=", x=350,y=600,w=90,h=90, color="lYellow",font=50,code=pressKey("return")}),
newKey({name="+", x=600,y=300,w=90,h=90, color="lBlue", font=50,code=pressKey("+")}), newKey({name="+", x=450,y=300,w=90,h=90, color="lBlue", font=50,code=pressKey("+")}),
newKey({name="-", x=600,y=400,w=90,h=90, color="lBlue", font=50,code=pressKey("-")}), newKey({name="-", x=450,y=400,w=90,h=90, color="lBlue", font=50,code=pressKey("-")}),
newKey({name="*", x=600,y=500,w=90,h=90, color="lBlue", font=50,code=pressKey("*")}), newKey({name="*", x=450,y=500,w=90,h=90, color="lBlue", font=50,code=pressKey("*")}),
newKey({name="/", x=600,y=600,w=90,h=90, color="lBlue", font=50,code=pressKey("/")}), newKey({name="/", x=450,y=600,w=90,h=90, color="lBlue", font=50,code=pressKey("/")}),
newButton({name="play", x=800,y=600,w=180,h=90, color="lGreen", font=40,code=pressKey("space"),hide=function()return not sceneTemp.pass end}), newButton({name="play", x=640,y=600,w=180,h=90, color="lGreen", font=40,code=pressKey("space"),hide=function()return not sceneTemp.pass end}),
}, },
main={ main={
newButton({name="play", x=150,y=280,w=200,h=160,color="lRed", font=55,code=function()SCN.go("mode")end}), newButton({name="play", x=150,y=280,w=200,h=160,color="lRed", font=55,code=function()SCN.go("mode")end}),

11
main.lua
View File

@@ -99,6 +99,9 @@ else
setting.swap=false setting.swap=false
setting.vib=2 setting.vib=2
setting.powerInfo=true setting.powerInfo=true
setting.fullscreen=true
love.window.setFullscreen(true)
love.resize(love.graphics.getWidth(),love.graphics.getHeight())
end end
end end
LANG.set(setting.lang) LANG.set(setting.lang)
@@ -116,8 +119,11 @@ if fs.getInfo("tech_ultimate+.dat")then fs.remove("tech_ultimate+.dat")end
R=modeRanks R=modeRanks
for k,v in next,R do for k,v in next,R do
if type(k)=="number"then if type(k)=="number"then
R[Modes[k].name],R[k]=R[k] local save=v
break if not R[Modes[k].name]then
R[Modes[k].name]=v
end
R[k]=nil
end end
end end
if R.master_adavnce then if R.master_adavnce then
@@ -134,7 +140,6 @@ if type(setting.spawn)~="number"then
end end
if S.version~=gameVersion then if S.version~=gameVersion then
S.version=gameVersion S.version=gameVersion
TEXT.show(text.newVersion,640,200,30,"fly",.3)
newVersionLaunch=true newVersionLaunch=true
fs.remove("sprintPenta.dat") fs.remove("sprintPenta.dat")