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

修复计算器的一些问题 close #178 close #179

Browse Source
This commit is contained in:
MrZ626
2021-08-09 11:53:56 +08:00
parent 0f896d0a4f
commit 2eae6cdfda
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
parts/scenes/app_calc.lua
View File

@@ -34,15 +34,22 @@ function scene.keyDown(key)
elseif key:sub(1,2)=="kp"then elseif key:sub(1,2)=="kp"then
scene.keyDown(key:sub(3)) scene.keyDown(key:sub(3))
elseif key=="."then elseif key=="."then
if not(val:find(".",nil,true)or val:find("e"))then if sym=="="then
sym,reg=false,false
val="0."
elseif not(val:find(".",nil,true)or val:find("e"))then
if sym and not reg then if sym and not reg then
reg=val reg=val
val="0." val="0."
else
val=val.."."
end end
val=val.."."
end end
elseif key=="e"then elseif key=="e"then
if sym~="="and not val:find("e")then if sym=="="then
sym,reg=false
val="0e"
elseif not val:find("e")then
val=val.."e" val=val.."e"
end end
elseif key=="backspace"then elseif key=="backspace"then
@@ -54,10 +61,14 @@ function scene.keyDown(key)
val=val:sub(1,-2) val=val:sub(1,-2)
end end
if val==""then val="0"end if val==""then val="0"end
elseif key=="+"or key=="="and kb.isDown("lshift","rshift")then sym="+" reg=false elseif key=="+"or key=="="and kb.isDown("lshift","rshift")then
elseif key=="*"or key=="8"and kb.isDown("lshift","rshift")then sym="*" reg=false if reg and sym then scene.keyDown("return")else reg=false end sym="+"
elseif key=="-"then sym="-" reg=false elseif key=="*"or key=="8"and kb.isDown("lshift","rshift")then
elseif key=="/"then sym="/" reg=false if reg and sym then scene.keyDown("return")else reg=false end sym="*"
elseif key=="-"then
if reg and sym then scene.keyDown("return")else reg=false end sym="-"
elseif key=="/"then
if reg and sym then scene.keyDown("return")else reg=false end sym="/"
elseif key=="return"then elseif key=="return"then
if val:sub(-1)=="e"then val=val:sub(1,-2)end if val:sub(-1)=="e"then val=val:sub(1,-2)end
if sym and reg then if sym and reg then
@@ -73,7 +84,8 @@ function scene.keyDown(key)
reg=false reg=false
elseif key=="escape"then elseif key=="escape"then
if val~="0"then if val~="0"then
val,reg,sym="0" reg,sym=false,false
val="0"
else else
SCN.back() SCN.back()
end end