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

部分弹出消息改用LOG.print输出到屏幕左上角

Browse Source
This commit is contained in:
MrZ626
2020-09-03 16:00:28 +08:00
parent b873aa09d6
commit 4da23852a7
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Zframework/file.lua
View File

@@ -99,7 +99,7 @@ function FILE.saveRecord(N,L)
local _,mes=F:write(dumpTable(L))
F:flush()F:close()
if not _ then
TEXT.show(text.recSavingError..(mes or"unknown error"),1140,650,20,"sudden",.5)
LOG.print(text.recSavingError..(mes or"unknown error"),color.red)
end
end
function FILE.delRecord(N)
@@ -125,7 +125,7 @@ function FILE.saveUnlock()
local _,mes=F:write(dumpTable(modeRanks))
F:flush()F:close()
if not _ then
TEXT.show(text.unlockSavingError..(mes or"unknown error"),1140,650,20,"sudden",.5)
LOG.print(text.unlockSavingError..(mes or"unknown error"),color.red)
end
end
@@ -151,7 +151,7 @@ function FILE.saveData()
local _,mes=F:write(dumpTable(stat))
F:flush()F:close()
if not _ then
TEXT.show(text.statSavingError..(mes or"unknown error"),1140,650,20,"sudden",.5)
LOG.print(text.statSavingError..(mes or"unknown error"),color.red)
end
end
@@ -175,8 +175,8 @@ function FILE.saveSetting()
F:open("w")
local _,mes=F:write(dumpTable(setting))
F:flush()F:close()
if _ then TEXT.show(text.settingSaved,1140,650,40,"sudden",.5)
else TEXT.show(text.settingSavingError..(mes or"unknown error"),1140,650,20,"sudden",.5)
if _ then LOG.print(text.settingSaved,color.green)
else LOG.print(text.settingSavingError..(mes or"unknown error"),color.red)
end
end
@@ -196,8 +196,8 @@ function FILE.saveKeyMap()
F:open("w")
local _,mes=F:write(dumpTable(keyMap))
F:flush()F:close()
if _ then TEXT.show(text.keyMapSaved,1140,650,26,"sudden",.5)
else TEXT.show(text.keyMapSavingError..(mes or"unknown error"),1140,650,20,"sudden",.5)
if _ then LOG.print(text.keyMapSaved,color.green)
else LOG.print(text.keyMapSavingError..(mes or"unknown error"),color.red)
end
end
@@ -217,8 +217,8 @@ function FILE.saveVK()
F:open("w")
local _,mes=F:write(dumpTable(VK_org))
F:flush()F:close()
if _ then TEXT.show(text.VKSaved,1140,650,26,"sudden",.5)
else TEXT.show(text.VKSavingError..(mes or"unknown error"),1140,650,20,"sudden",.5)
if _ then LOG.print(text.VKSaved,color.green)
else LOG.print(text.VKSavingError..(mes or"unknown error"),color.red)
end
end
return FILE

14
Zframework/init.lua
View File

@@ -193,11 +193,11 @@ function love.keypressed(i)
DBP("DEBUG:")
elseif i=="f3"then
LOG.print("挂了.gif")
elseif i=="f8"then devMode=nil TEXT.show("DEBUG OFF",640,360,80,"fly",.8)
elseif i=="f9"then devMode=1 TEXT.show("DEBUG 1",640,360,80,"fly",.8)
elseif i=="f10"then devMode=2 TEXT.show("DEBUG 2",640,360,80,"fly",.8)
elseif i=="f11"then devMode=3 TEXT.show("DEBUG 3",640,360,80,"fly",8)
elseif i=="f12"then devMode=4 TEXT.show("DEBUG 4",640,360,80,"fly",12)
elseif i=="f8"then devMode=nil LOG.print("DEBUG OFF",color.yellow)
elseif i=="f9"then devMode=1 LOG.print("DEBUG 1",color.yellow)
elseif i=="f10"then devMode=2 LOG.print("DEBUG 2",color.yellow)
elseif i=="f11"then devMode=3 LOG.print("DEBUG 3",color.yellow)
elseif i=="f12"then devMode=4 LOG.print("DEBUG 4",color.yellow)
elseif devMode==2 then
if i=="k"then
for i=1,8 do
@@ -245,7 +245,7 @@ function love.keypressed(i)
end
else
devMode=1
TEXT.show("DEBUG ON",640,360,80,"fly",.8)
LOG.print("DEBUG ON",color.yellow)
end
end
function love.keyreleased(i)
@@ -537,7 +537,7 @@ function love.run()
lastFreshPow=Timer()
if gc.getWidth()~=scr.w then
love.resize(gc.getWidth(),gc.getHeight())
TEXT.show("resized",200,100,30,"stretch")
LOG.print("Resized",color.yellow)
end
end

18
parts/scenes.lua
View File

@@ -92,7 +92,7 @@ do--calculator
elseif S.val==196000+022 then
S.pass=true
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)
LOG.print("\68\69\86\58\87\97\116\101\114\109\97\114\107\32\82\101\109\111\118\101\100")
SFX.play("clear")
elseif S.val==72943816 then
S.pass=true
@@ -102,7 +102,7 @@ do--calculator
end
end
FILE.saveUnlock()
TEXT.show("\68\69\86\58\85\78\76\79\67\75\65\76\76",640,360,60,"stretch",.6)
LOG.print("\68\69\86\58\85\78\76\79\67\75\65\76\76",640,360,60)
SFX.play("clear_2")
elseif S.val==1379e8+2626e4+1379 then
S.pass=true
@@ -574,7 +574,7 @@ do--intro
elseif newVersionLaunch then
SCN.push("main","fade")
SCN.swapTo("history","fade")
TEXT.show(text.newVersion,640,200,30,"fly",.3)
LOG.print(text.newVersion,color.lBlue)
else
SCN.go("main")
end
@@ -784,10 +784,10 @@ do--mode
if mapCam.sel=="custom_clear"or mapCam.sel=="custom_puzzle"then
if customSel[11]>1 then
if customSel[7]==5 then
TEXT.show(text.ai_fixed,640,360,50,"appear")
LOG.print(text.ai_fixed,color.red)
return
elseif #preBag>0 then
TEXT.show(text.ai_prebag,640,360,50,"appear")
LOG.print(text.ai_prebag,color.red)
return
end
end
@@ -1171,14 +1171,14 @@ do--sequence
elseif key=="c"and kb.isDown("lctrl","rctrl")or key=="cC"then
if #preBag>0 then
sys.setClipboardText("Techmino SEQ:"..copySequence())
TEXT.show(text.copySuccess,640,225,50,"appear",.5)
LOG.print(text.copySuccess,color.green)
end
elseif key=="v"and kb.isDown("lctrl","rctrl")or key=="cV"then
local str=sys.getClipboardText()
local p=string.find(str,":")--ptr*
if p then str=string.sub(str,p+1)end
if not pasteSequence(str)then
TEXT.show(text.dataCorrupted,640,225,45,"flicker",.5)
LOG.print(text.dataCorrupted,color.red)
end
elseif #key==1 then
local i=(kb.isDown("lshift","lalt","rshift","ralt")and minoKey2 or minoKey)[key]
@@ -1341,13 +1341,13 @@ do--draw
SCN.back()
elseif key=="c"and kb.isDown("lctrl","rctrl")or key=="cC"then
sys.setClipboardText("Techmino Field:"..copyBoard())
TEXT.show(text.copySuccess,350,360,40,"appear",.5)
LOG.print(text.copySuccess,color.green)
elseif key=="v"and kb.isDown("lctrl","rctrl")or key=="cV"then
local str=sys.getClipboardText()
local p=string.find(str,":")--ptr*
if p then str=string.sub(str,p+1)end
if not pasteBoard(str)then
TEXT.show(text.dataCorrupted,350,360,35,"flicker",.5)
LOG.print(text.dataCorrupted,color.red)
end
else
pen=penKey[key]or pen