整理代码，调整local函数名规范（较边缘的代码不必遵守，比如外部的库和小程序）：
特别临时性的用全大写字母缩写或者单字母 TASK模块用到的任务函数和检查函数开头分别为task_和check_ 其他函数开头添加下划线作为指示
This commit is contained in:
MrZ626
@@ -7,7 +7,7 @@ local scene={}
|
||||
local selected--if waiting for key
|
||||
local keyList
|
||||
|
||||
local function freshKeyList()
|
||||
local function _freshKeyList()
|
||||
keyList={}for i=0,20 do keyList[i]={}end
|
||||
for k,v in next,keyMap.keyboard do
|
||||
ins(keyList[v],{COLOR.lB,k})
|
||||
@@ -19,7 +19,7 @@ end
|
||||
|
||||
function scene.sceneInit()
|
||||
selected=false
|
||||
freshKeyList()
|
||||
_freshKeyList()
|
||||
BG.set('none')
|
||||
end
|
||||
function scene.sceneBack()
|
||||
@@ -39,7 +39,7 @@ function scene.keyDown(key,isRep)
|
||||
keyMap.keyboard[k]=nil
|
||||
end
|
||||
end
|
||||
freshKeyList()
|
||||
_freshKeyList()
|
||||
selected=false
|
||||
SFX.play('finesseError',.5)
|
||||
else
|
||||
@@ -48,7 +48,7 @@ function scene.keyDown(key,isRep)
|
||||
elseif selected then
|
||||
if not forbbidenKeys[key]then
|
||||
keyMap.keyboard[key]=selected
|
||||
freshKeyList()
|
||||
_freshKeyList()
|
||||
selected=false
|
||||
SFX.play('reach',.5)
|
||||
end
|
||||
@@ -64,7 +64,7 @@ function scene.gamepadDown(key)
|
||||
keyMap.joystick[k]=nil
|
||||
end
|
||||
end
|
||||
freshKeyList()
|
||||
_freshKeyList()
|
||||
selected=false
|
||||
SFX.play('finesseError',.5)
|
||||
else
|
||||
@@ -72,7 +72,7 @@ function scene.gamepadDown(key)
|
||||
end
|
||||
elseif selected then
|
||||
keyMap.joystick[key]=selected
|
||||
freshKeyList()
|
||||
_freshKeyList()
|
||||
selected=false
|
||||
SFX.play('reach',.5)
|
||||
else
|
||||
@@ -106,7 +106,7 @@ function scene.draw()
|
||||
end
|
||||
end
|
||||
|
||||
local function setSel(i)
|
||||
local function _setSel(i)
|
||||
if selected==i then
|
||||
selected=false
|
||||
SFX.play('rotate',.5)
|
||||
@@ -116,29 +116,29 @@ local function setSel(i)
|
||||
end
|
||||
end
|
||||
scene.widgetList={
|
||||
WIDGET.newKey{name="a1",x=160,y=40,w=200,h=60,code=function()setSel(1)end},
|
||||
WIDGET.newKey{name="a2",x=160,y=100,w=200,h=60,code=function()setSel(2)end},
|
||||
WIDGET.newKey{name="a3",x=160,y=160,w=200,h=60,code=function()setSel(3)end},
|
||||
WIDGET.newKey{name="a4",x=160,y=220,w=200,h=60,code=function()setSel(4)end},
|
||||
WIDGET.newKey{name="a5",x=160,y=280,w=200,h=60,code=function()setSel(5)end},
|
||||
WIDGET.newKey{name="a6",x=160,y=340,w=200,h=60,code=function()setSel(6)end},
|
||||
WIDGET.newKey{name="a7",x=160,y=400,w=200,h=60,code=function()setSel(7)end},
|
||||
WIDGET.newKey{name="a8",x=160,y=460,w=200,h=60,code=function()setSel(8)end},
|
||||
WIDGET.newKey{name="a9",x=160,y=520,w=200,h=60,code=function()setSel(9)end},
|
||||
WIDGET.newKey{name="a10",x=160,y=580,w=200,h=60,code=function()setSel(10)end},
|
||||
WIDGET.newKey{name="a1",x=160,y=40,w=200,h=60,code=function()_setSel(1)end},
|
||||
WIDGET.newKey{name="a2",x=160,y=100,w=200,h=60,code=function()_setSel(2)end},
|
||||
WIDGET.newKey{name="a3",x=160,y=160,w=200,h=60,code=function()_setSel(3)end},
|
||||
WIDGET.newKey{name="a4",x=160,y=220,w=200,h=60,code=function()_setSel(4)end},
|
||||
WIDGET.newKey{name="a5",x=160,y=280,w=200,h=60,code=function()_setSel(5)end},
|
||||
WIDGET.newKey{name="a6",x=160,y=340,w=200,h=60,code=function()_setSel(6)end},
|
||||
WIDGET.newKey{name="a7",x=160,y=400,w=200,h=60,code=function()_setSel(7)end},
|
||||
WIDGET.newKey{name="a8",x=160,y=460,w=200,h=60,code=function()_setSel(8)end},
|
||||
WIDGET.newKey{name="a9",x=160,y=520,w=200,h=60,code=function()_setSel(9)end},
|
||||
WIDGET.newKey{name="a10",x=160,y=580,w=200,h=60,code=function()_setSel(10)end},
|
||||
|
||||
WIDGET.newKey{name="a11",x=800,y=40,w=200,h=60,code=function()setSel(11)end},
|
||||
WIDGET.newKey{name="a12",x=800,y=100,w=200,h=60,code=function()setSel(12)end},
|
||||
WIDGET.newKey{name="a13",x=800,y=160,w=200,h=60,code=function()setSel(13)end},
|
||||
WIDGET.newKey{name="a14",x=800,y=220,w=200,h=60,code=function()setSel(14)end},
|
||||
WIDGET.newKey{name="a15",x=800,y=280,w=200,h=60,code=function()setSel(15)end},
|
||||
WIDGET.newKey{name="a16",x=800,y=340,w=200,h=60,code=function()setSel(16)end},
|
||||
WIDGET.newKey{name="a17",x=800,y=400,w=200,h=60,code=function()setSel(17)end},
|
||||
WIDGET.newKey{name="a18",x=800,y=460,w=200,h=60,code=function()setSel(18)end},
|
||||
WIDGET.newKey{name="a19",x=800,y=520,w=200,h=60,code=function()setSel(19)end},
|
||||
WIDGET.newKey{name="a20",x=800,y=580,w=200,h=60,code=function()setSel(20)end},
|
||||
WIDGET.newKey{name="a11",x=800,y=40,w=200,h=60,code=function()_setSel(11)end},
|
||||
WIDGET.newKey{name="a12",x=800,y=100,w=200,h=60,code=function()_setSel(12)end},
|
||||
WIDGET.newKey{name="a13",x=800,y=160,w=200,h=60,code=function()_setSel(13)end},
|
||||
WIDGET.newKey{name="a14",x=800,y=220,w=200,h=60,code=function()_setSel(14)end},
|
||||
WIDGET.newKey{name="a15",x=800,y=280,w=200,h=60,code=function()_setSel(15)end},
|
||||
WIDGET.newKey{name="a16",x=800,y=340,w=200,h=60,code=function()_setSel(16)end},
|
||||
WIDGET.newKey{name="a17",x=800,y=400,w=200,h=60,code=function()_setSel(17)end},
|
||||
WIDGET.newKey{name="a18",x=800,y=460,w=200,h=60,code=function()_setSel(18)end},
|
||||
WIDGET.newKey{name="a19",x=800,y=520,w=200,h=60,code=function()_setSel(19)end},
|
||||
WIDGET.newKey{name="a20",x=800,y=580,w=200,h=60,code=function()_setSel(20)end},
|
||||
|
||||
WIDGET.newKey{name="restart",x=160,y=670,w=200,h=60,code=function()setSel(0)end},
|
||||
WIDGET.newKey{name="restart",x=160,y=670,w=200,h=60,code=function()_setSel(0)end},
|
||||
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=190,h=80,fText=TEXTURE.back,code=backScene},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user