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

修正三个不当颜色名

Browse Source
This commit is contained in:
MrZ626
2021-04-18 23:21:56 +08:00
parent 59a612c6fc
commit 63d3f02abe
33 changed files with 218 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
parts/scenes/app_15p.lua
View File

@@ -223,7 +223,7 @@ local frontColor={
COLOR.white,COLOR.white,COLOR.white,COLOR.white,
COLOR.white,COLOR.white,COLOR.white,COLOR.white,
COLOR.white,COLOR.white,COLOR.white,COLOR.white,
},--Grey
},--Gray
{
COLOR.white,COLOR.white,COLOR.white,COLOR.white,
COLOR.white,COLOR.white,COLOR.white,COLOR.white,
@@ -251,11 +251,11 @@ local backColor={
COLOR.dGreen,COLOR.dYellow,COLOR.dPurple,COLOR.dPurple,
},--Colored(row)
{
COLOR.dGrey,COLOR.dGrey,COLOR.dGrey,COLOR.dGrey,
COLOR.dGrey,COLOR.dGrey,COLOR.dGrey,COLOR.dGrey,
COLOR.dGrey,COLOR.dGrey,COLOR.dGrey,COLOR.dGrey,
COLOR.dGrey,COLOR.dGrey,COLOR.dGrey,COLOR.dGrey,
},--Grey
COLOR.dGray,COLOR.dGray,COLOR.dGray,COLOR.dGray,
COLOR.dGray,COLOR.dGray,COLOR.dGray,COLOR.dGray,
COLOR.dGray,COLOR.dGray,COLOR.dGray,COLOR.dGray,
COLOR.dGray,COLOR.dGray,COLOR.dGray,COLOR.dGray,
},--Gray
{
COLOR.black,COLOR.black,COLOR.black,COLOR.black,
COLOR.black,COLOR.black,COLOR.black,COLOR.black,

8
parts/scenes/app_2048.lua
View File

@@ -370,7 +370,7 @@ function scene.draw()
"Y"
)or(
repeater.seq[i]==repeater.last[i]and
"grey"or
"gray"or
"white"
)
])
@@ -414,7 +414,7 @@ function scene.draw()
mStr(tileName[N],320+(x-.5)*160,40+(y-.5)*160-fontSize*.7)
end
else
setColor(COLOR.grey)
setColor(COLOR.gray)
rectangle("fill",x*160+163,y*160-117,154,154,15)
end
else
@@ -489,8 +489,8 @@ scene.widgetList={
WIDGET.newKey{name="left", x=55,y=560,w=100,fText="←",font=50,color="yellow",code=pressKey"left",hide=function()return tapControl end},
WIDGET.newKey{name="right", x=255,y=560,w=100,fText="→",font=50,color="yellow",code=pressKey"right",hide=function()return tapControl end},
WIDGET.newKey{name="skip", x=155,y=400,w=100,font=20,color="yellow",code=pressKey"space",hide=function()return state~=1 or not skipper.cd or skipper.cd>0 end},
WIDGET.newKey{name="record1", x=1100,y=390,w=220,h=50,fText="",color="grey",code=pressKey"1",hide=function()return state==2 end},
WIDGET.newKey{name="record2", x=1100,y=450,w=220,h=50,fText="",color="grey",code=pressKey"2",hide=function()return state==2 end},
WIDGET.newKey{name="record1", x=1100,y=390,w=220,h=50,fText="",color="gray",code=pressKey"1",hide=function()return state==2 end},
WIDGET.newKey{name="record2", x=1100,y=450,w=220,h=50,fText="",color="gray",code=pressKey"2",hide=function()return state==2 end},
WIDGET.newKey{name="replay1", x=1245,y=390,w=50,fText="!",color="green",code=pressKey"c1",hide=function()return state==2 or #repeater.seq[1]==0 end},
WIDGET.newKey{name="replay2", x=1245,y=450,w=50,fText="!",color="green",code=pressKey"c2",hide=function()return state==2 or #repeater.seq[2]==0 end},
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene},

8
parts/scenes/app_cannon.lua
View File

@@ -82,16 +82,16 @@ end
local scoreColor={
"white",--0
"water",--20
"aqua",--20
"sky",--40
"blue",--60
"grape",--80
"pink",--100
"red","fire","orange","yellow","lWater",--200
"red","fire","orange","yellow","lAqua",--200
"lSky","lBlue","lGrape","lPink","lRed",--300
"lFire","lOrange","lYellow","dWater","dSky",--400
"lFire","lOrange","lYellow","dAqua","dSky",--400
"dBlue","dGrape","dPink","dRed","dFire",--500
"dYellow","lGrey","grey","dGrey",--before 600, black after
"dYellow","lGray","gray","dGray",--before 600, black after
}
function scene.draw()
--Spawn area

34
parts/scenes/app_cmd.lua
View File

@@ -275,7 +275,7 @@ do--commands.help(arg)
log{C.lPink,"Page ",C.lG,page,C.lPink," of ",C.lG,maxPage}
for i=pageSize*(page-1)+1,math.min(pageSize*page,#command_help_list)do
local cmd=command_help_list[i]
log{C.W,cmd,C.grey," "..command_help_messages[cmd].description}
log{C.W,cmd,C.gray," "..command_help_messages[cmd].description}
end
else
log{C.R,"Invalid page number. Must be between 1 and "..maxPage.." (inclusive)."}
@@ -306,7 +306,7 @@ function commands.print(name)
log{C.R,"No file called '"..name.."'"}
end
else
log{C.water,"Usage: print [filename]"}
log{C.aqua,"Usage: print [filename]"}
end
end
function commands.url(url)
@@ -316,7 +316,7 @@ function commands.url(url)
log{C.R,"[ERR] ",C.W,err}
end
else
log{C.water,"Usage: url [url]"}
log{C.aqua,"Usage: url [url]"}
end
end
local function tree(path,name,depth)
@@ -368,7 +368,7 @@ function commands.del(name)
log{C.R,"No file called '"..name.."'"}
end
else
log{C.water,"Usage: del [filename]"}
log{C.aqua,"Usage: del [filename]"}
end
end
commands.exit=backScene
@@ -384,7 +384,7 @@ function commands.fn(n)
return
end
end
log{C.water,"Usage: fn [1~12]"}
log{C.aqua,"Usage: fn [1~12]"}
end
function commands.scrinfo()
for _,v in next,SCR.info()do
@@ -396,7 +396,7 @@ function commands.wireframe(bool)
gc.setWireframe(bool=="true")
log("Wireframe: "..(gc.isWireframe()and"on"or"off"))
else
log{C.water,"Usage: wireframe [true|false]"}
log{C.aqua,"Usage: wireframe [true|false]"}
end
end
function commands.gammacorrect(bool)
@@ -404,7 +404,7 @@ function commands.gammacorrect(bool)
love._setGammaCorrect(bool=="true")
log("GammaCorrect: "..(gc.isGammaCorrect()and"on"or"off"))
else
log{C.water,"Usage: gammacorrect [true|false]"}
log{C.aqua,"Usage: gammacorrect [true|false]"}
end
end
function commands.rmwtm(pw)
@@ -413,7 +413,7 @@ function commands.rmwtm(pw)
log{C.lC,"\87\97\116\101\114\109\97\114\107\32\82\101\109\111\118\101\100"}
SFX.play("clear")
else
log{C.water,"Usage: rmwtm [password]"}
log{C.aqua,"Usage: rmwtm [password]"}
end
end
function commands.unlockall(bool)
@@ -437,7 +437,7 @@ function commands.play(m)--marathon_bfmax can only entered through here
elseif m~=""then
log{C.R,"No mode called "..m}
else
log{C.water,"Usage: play [modeName]"}
log{C.aqua,"Usage: play [modeName]"}
end
end
function commands.playbgm(bgm)
@@ -452,7 +452,7 @@ function commands.playbgm(bgm)
log("Already playing: "..bgm)
end
else
log{C.water,"Usage: playbgm [bgmName]"}
log{C.aqua,"Usage: playbgm [bgmName]"}
end
end
function commands.stopbgm()
@@ -470,7 +470,7 @@ function commands.setbg(name)
log("Background already set to '"..name.."'")
end
else
log{C.water,"Usage: setbg [bgName]"}
log{C.aqua,"Usage: setbg [bgName]"}
end
end
function commands.theme(name)
@@ -481,7 +481,7 @@ function commands.theme(name)
log("No theme called "..name)
end
else
log{C.water,"Usage: theme [themeName]"}
log{C.aqua,"Usage: theme [themeName]"}
end
end
function commands.demo()
@@ -519,11 +519,11 @@ do--commands.applet(name)
return
end
end
log{C.water,"No this applet"}
log{C.aqua,"No this applet"}
else
log{C.water,"Usage:"}
log{C.water,"applet -list"}
log{C.water,"applet [appName]"}
log{C.aqua,"Usage:"}
log{C.aqua,"applet -list"}
log{C.aqua,"applet [appName]"}
end
end
commands.app=commands.applet
@@ -689,7 +689,7 @@ function scene.keyDown(k)
log(">Commands start with '"..str.."' :")
table.sort(res)
for i=1,#res do
log{COLOR.lGrey,res[i]}
log{COLOR.lGray,res[i]}
end
elseif #res==1 then
inputBox.value=res[1]

2
parts/scenes/app_dropper.lua
View File

@@ -188,7 +188,7 @@ function scene.draw()
gc.setColor(COLOR.rainbow_light(TIME()*2.6))
mStr("DROPPER",640,120)
gc.setColor(COLOR.rainbow_grey(TIME()*1.626))
gc.setColor(COLOR.rainbow_gray(TIME()*1.626))
setFont(55)
mStr("Score - "..score,640,290)
mStr("High Score - "..highScore,640,370)

2
parts/scenes/app_dtw.lua
View File

@@ -107,7 +107,7 @@ function scene.sceneInit()
mode=1
arcade=true
reset()
BG.set("grey")
BG.set("gray")
BGM.play("way")
love.keyboard.setKeyRepeat(false)
end

2
parts/scenes/app_tap.lua
View File

@@ -13,7 +13,7 @@ function scene.sceneInit()
lastKey=nil
speed=0
keyTime={}for i=1,40 do keyTime[i]=-1e99 end
BG.set("grey")
BG.set("gray")
BGM.play("push")
love.keyboard.setKeyRepeat(false)
end

2
parts/scenes/app_ten.lua
View File

@@ -269,7 +269,7 @@ function scene.draw()
local N=board[i][j]
if N>0 then
if hide and N>maxNew then
setColor(COLOR.dGrey)
setColor(COLOR.dGray)
rectangle("fill",320+j*128-128,40+i*128-128,128,128)
setColor(1,1,1,.3)
mStr("?",j*128+256,i*128-75)

8
parts/scenes/customGame.lua
View File

@@ -144,9 +144,9 @@ end
scene.widgetList={
WIDGET.newText{name="title", x=520, y=5,font=70,align="R"},
WIDGET.newText{name="subTitle", x=530, y=50,font=35,align="L",color="grey"},
WIDGET.newText{name="defSeq", x=330, y=550,align="L",color="grey",hide=function()return BAG[1]end},
WIDGET.newText{name="noMsn", x=610, y=550,align="L",color="grey",hide=function()return MISSION[1]end},
WIDGET.newText{name="subTitle", x=530, y=50,font=35,align="L",color="gray"},
WIDGET.newText{name="defSeq", x=330, y=550,align="L",color="gray",hide=function()return BAG[1]end},
WIDGET.newText{name="noMsn", x=610, y=550,align="L",color="gray",hide=function()return MISSION[1]end},
--Basic
WIDGET.newSelector{name="drop", x=170, y=150,w=220,color="orange", list={0,.125,.25,.5,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},disp=CUSval("drop"),code=CUSsto("drop")},
@@ -167,7 +167,7 @@ scene.widgetList={
--More
WIDGET.newKey{name="advance", x=730, y=190,w=220,h=90,color="red", font=35,code=goScene"custom_advance"},
WIDGET.newKey{name="mod", x=730, y=310,w=220,h=90,color="white", font=35,code=goScene"mod"},
WIDGET.newKey{name="field", x=170, y=640,w=240,h=80,color="water", font=25,code=goScene"custom_field"},
WIDGET.newKey{name="field", x=170, y=640,w=240,h=80,color="aqua", font=25,code=goScene"custom_field"},
WIDGET.newKey{name="sequence", x=450, y=640,w=240,h=80,color="pink", font=25,code=goScene"custom_sequence"},
WIDGET.newKey{name="mission", x=730, y=640,w=240,h=80,color="sky", font=25,code=goScene"custom_mission"},

2
parts/scenes/custom_advance.lua
View File

@@ -11,7 +11,7 @@ local scene={}
scene.widgetList={
WIDGET.newText{name="title", x=520,y=5,font=70,align="R"},
WIDGET.newText{name="subTitle", x=530,y=50,font=35,align="L",color="grey"},
WIDGET.newText{name="subTitle", x=530,y=50,font=35,align="L",color="gray"},
--Control
WIDGET.newSlider{name="nextCount", x=200, y=150, w=200,unit=6,disp=CUSval("nextCount"),code=CUSsto("nextCount")},

16
parts/scenes/custom_field.lua
View File

@@ -424,16 +424,16 @@ end
local function setPen(i)return function()penType=i end end
scene.widgetList={
WIDGET.newText{name="title", x=1020,y=5,font=70,align="R"},
WIDGET.newText{name="subTitle", x=1030,y=50,font=35,align="L",color="grey"},
WIDGET.newText{name="subTitle", x=1030,y=50,font=35,align="L",color="gray"},
WIDGET.newButton{name="b1", x=580, y=130,w=75,fText="",color=COLOR.red, code=setPen(1)},--B1
WIDGET.newButton{name="b2", x=660, y=130,w=75,fText="",color=COLOR.fire, code=setPen(2)},--B2
WIDGET.newButton{name="b3", x=740, y=130,w=75,fText="",color=COLOR.orange, code=setPen(3)},--B3
WIDGET.newButton{name="b4", x=820, y=130,w=75,fText="",color=COLOR.yellow, code=setPen(4)},--B4
WIDGET.newButton{name="b5", x=900, y=130,w=75,fText="",color=COLOR.lame, code=setPen(5)},--B5
WIDGET.newButton{name="b5", x=900, y=130,w=75,fText="",color=COLOR.lime, code=setPen(5)},--B5
WIDGET.newButton{name="b6", x=980, y=130,w=75,fText="",color=COLOR.grass, code=setPen(6)},--B6
WIDGET.newButton{name="b7", x=1060, y=130,w=75,fText="",color=COLOR.green, code=setPen(7)},--B7
WIDGET.newButton{name="b8", x=1140, y=130,w=75,fText="",color=COLOR.water, code=setPen(8)},--B8
WIDGET.newButton{name="b8", x=1140, y=130,w=75,fText="",color=COLOR.aqua, code=setPen(8)},--B8
WIDGET.newButton{name="b9", x=580, y=210,w=75,fText="",color=COLOR.cyan, code=setPen(9)},--B9
WIDGET.newButton{name="b10", x=660, y=210,w=75,fText="",color=COLOR.sky, code=setPen(10)},--B10
@@ -444,17 +444,17 @@ scene.widgetList={
WIDGET.newButton{name="b15", x=1060, y=210,w=75,fText="",color=COLOR.magenta,code=setPen(15)},--B15
WIDGET.newButton{name="b16", x=1140, y=210,w=75,fText="",color=COLOR.pink, code=setPen(16)},--B16
WIDGET.newButton{name="b17", x=580, y=290,w=75,fText="[ ]",color="dGrey", code=setPen(17)},--BONE
WIDGET.newButton{name="b17", x=580, y=290,w=75,fText="[ ]",color="dGray", code=setPen(17)},--BONE
WIDGET.newButton{name="b18", x=660, y=290,w=75,fText="N", color="black", code=setPen(18)},--HIDE
WIDGET.newButton{name="b19", x=740, y=290,w=75,fText="B", color="lYellow",code=setPen(19)},--BOMB
WIDGET.newButton{name="b20", x=820, y=290,w=75,fText="_", color="grey", code=setPen(20)},--GB1
WIDGET.newButton{name="b21", x=900, y=290,w=75,fText="_", color="lGrey", code=setPen(21)},--GB2
WIDGET.newButton{name="b20", x=820, y=290,w=75,fText="_", color="gray", code=setPen(20)},--GB1
WIDGET.newButton{name="b21", x=900, y=290,w=75,fText="_", color="lGray", code=setPen(21)},--GB2
WIDGET.newButton{name="b22", x=980, y=290,w=75,fText="_", color="dPurple",code=setPen(22)},--GB3
WIDGET.newButton{name="b23", x=1060, y=290,w=75,fText="_", color="dRed", code=setPen(23)},--GB4
WIDGET.newButton{name="b24", x=1140, y=290,w=75,fText="_", color="dGreen", code=setPen(24)},--GB5
WIDGET.newButton{name="any", x=600, y=400,w=120,color="lGrey", font=40,code=setPen(0)},
WIDGET.newButton{name="space", x=730, y=400,w=120,color="grey", font=65,code=setPen(-1)},
WIDGET.newButton{name="any", x=600, y=400,w=120,color="lGray", font=40,code=setPen(0)},
WIDGET.newButton{name="space", x=730, y=400,w=120,color="gray", font=65,code=setPen(-1)},
WIDGET.newButton{name="smartPen", x=860, y=400,w=120,color="lGreen", font=30,code=setPen(-2)},
WIDGET.newButton{name="pushLine", x=990, y=400,w=120,h=120,color="lYellow",font=20,code=pressKey"k"},
WIDGET.newButton{name="delLine", x=1120, y=400,w=120,h=120,color="lYellow",font=20,code=pressKey"l"},

4
parts/scenes/custom_mission.lua
View File

@@ -160,7 +160,7 @@ function scene.draw()
elseif L[i]>4 then
gc.setColor(COLOR.rainbow(i+TIME()*6.26))
else
gc.setColor(COLOR.grey)
gc.setColor(COLOR.gray)
end
gc.print(missionEnum[L[i]],x,y-25)
x=x+56
@@ -185,7 +185,7 @@ end
scene.widgetList={
WIDGET.newText{name="title", x=520,y=5,font=70,align="R"},
WIDGET.newText{name="subTitle", x=530,y=50,font=35,align="L",color="grey"},
WIDGET.newText{name="subTitle", x=530,y=50,font=35,align="L",color="gray"},
WIDGET.newKey{name="_1", x=800, y=540, w=90, font=50,code=pressKey(01)},
WIDGET.newKey{name="_2", x=900, y=540, w=90, font=50,code=pressKey(02)},

46
parts/scenes/custom_sequence.lua
View File

@@ -186,7 +186,7 @@ end
scene.widgetList={
WIDGET.newText{name="title", x=520,y=5,font=70,align="R"},
WIDGET.newText{name="subTitle",x=530,y=50,font=35,align="L",color="grey"},
WIDGET.newText{name="subTitle",x=530,y=50,font=35,align="L",color="gray"},
WIDGET.newSelector{name="sequence",
x=1080,y=60,w=200,color="yellow",
@@ -208,30 +208,30 @@ scene.widgetList={
WIDGET.newKey{name="backsp",x=920,y=460,w=80,color="lYellow",font=50,code=pressKey"backspace"},
WIDGET.newKey{name="reset", x=1000,y=460,w=80,color="lYellow",font=25,code=pressKey"delete"},
WIDGET.newKey{name="Z5", x=120,y=540,w=80,color="lGrey",font=50,code=pressKey(8)},
WIDGET.newKey{name="S5", x=200,y=540,w=80,color="lGrey",font=50,code=pressKey(9)},
WIDGET.newKey{name="P", x=280,y=540,w=80,color="lGrey",font=50,code=pressKey(10)},
WIDGET.newKey{name="Q", x=360,y=540,w=80,color="lGrey",font=50,code=pressKey(11)},
WIDGET.newKey{name="F", x=440,y=540,w=80,color="lGrey",font=50,code=pressKey(12)},
WIDGET.newKey{name="E", x=520,y=540,w=80,color="lGrey",font=50,code=pressKey(13)},
WIDGET.newKey{name="T5", x=600,y=540,w=80,color="lGrey",font=50,code=pressKey(14)},
WIDGET.newKey{name="U", x=680,y=540,w=80,color="lGrey",font=50,code=pressKey(15)},
WIDGET.newKey{name="V", x=760,y=540,w=80,color="lGrey",font=50,code=pressKey(16)},
WIDGET.newKey{name="I3", x=840,y=540,w=80,color="grey",font=50,code=pressKey(26)},
WIDGET.newKey{name="C", x=920,y=540,w=80,color="grey",font=50,code=pressKey(27)},
WIDGET.newKey{name="Z5", x=120,y=540,w=80,color="lGray",font=50,code=pressKey(8)},
WIDGET.newKey{name="S5", x=200,y=540,w=80,color="lGray",font=50,code=pressKey(9)},
WIDGET.newKey{name="P", x=280,y=540,w=80,color="lGray",font=50,code=pressKey(10)},
WIDGET.newKey{name="Q", x=360,y=540,w=80,color="lGray",font=50,code=pressKey(11)},
WIDGET.newKey{name="F", x=440,y=540,w=80,color="lGray",font=50,code=pressKey(12)},
WIDGET.newKey{name="E", x=520,y=540,w=80,color="lGray",font=50,code=pressKey(13)},
WIDGET.newKey{name="T5", x=600,y=540,w=80,color="lGray",font=50,code=pressKey(14)},
WIDGET.newKey{name="U", x=680,y=540,w=80,color="lGray",font=50,code=pressKey(15)},
WIDGET.newKey{name="V", x=760,y=540,w=80,color="lGray",font=50,code=pressKey(16)},
WIDGET.newKey{name="I3", x=840,y=540,w=80,color="gray",font=50,code=pressKey(26)},
WIDGET.newKey{name="C", x=920,y=540,w=80,color="gray",font=50,code=pressKey(27)},
WIDGET.newKey{name="rnd", x=1000,y=540,w=80,color="red",font=25,code=pressKey"="},
WIDGET.newKey{name="W", x=120,y=620,w=80,color="lGrey",font=50,code=pressKey(17)},
WIDGET.newKey{name="X", x=200,y=620,w=80,color="lGrey",font=50,code=pressKey(18)},
WIDGET.newKey{name="J5", x=280,y=620,w=80,color="lGrey",font=50,code=pressKey(19)},
WIDGET.newKey{name="L5", x=360,y=620,w=80,color="lGrey",font=50,code=pressKey(20)},
WIDGET.newKey{name="R", x=440,y=620,w=80,color="lGrey",font=50,code=pressKey(21)},
WIDGET.newKey{name="Y", x=520,y=620,w=80,color="lGrey",font=50,code=pressKey(22)},
WIDGET.newKey{name="N", x=600,y=620,w=80,color="lGrey",font=50,code=pressKey(23)},
WIDGET.newKey{name="H", x=680,y=620,w=80,color="lGrey",font=50,code=pressKey(24)},
WIDGET.newKey{name="I5", x=760,y=620,w=80,color="lGrey",font=50,code=pressKey(25)},
WIDGET.newKey{name="I2", x=840,y=620,w=80,color="dGrey",font=50,code=pressKey(28)},
WIDGET.newKey{name="O1", x=920,y=620,w=80,color="dGrey",font=50,code=pressKey(29)},
WIDGET.newKey{name="W", x=120,y=620,w=80,color="lGray",font=50,code=pressKey(17)},
WIDGET.newKey{name="X", x=200,y=620,w=80,color="lGray",font=50,code=pressKey(18)},
WIDGET.newKey{name="J5", x=280,y=620,w=80,color="lGray",font=50,code=pressKey(19)},
WIDGET.newKey{name="L5", x=360,y=620,w=80,color="lGray",font=50,code=pressKey(20)},
WIDGET.newKey{name="R", x=440,y=620,w=80,color="lGray",font=50,code=pressKey(21)},
WIDGET.newKey{name="Y", x=520,y=620,w=80,color="lGray",font=50,code=pressKey(22)},
WIDGET.newKey{name="N", x=600,y=620,w=80,color="lGray",font=50,code=pressKey(23)},
WIDGET.newKey{name="H", x=680,y=620,w=80,color="lGray",font=50,code=pressKey(24)},
WIDGET.newKey{name="I5", x=760,y=620,w=80,color="lGray",font=50,code=pressKey(25)},
WIDGET.newKey{name="I2", x=840,y=620,w=80,color="dGray",font=50,code=pressKey(28)},
WIDGET.newKey{name="O1", x=920,y=620,w=80,color="dGray",font=50,code=pressKey(29)},
WIDGET.newButton{name="copy", x=1140, y=460,w=170,h=80,color="lRed", font=40,code=pressKey"cC",hide=function()return #BAG==0 end},

2
parts/scenes/depause.lua
View File

@@ -24,7 +24,7 @@ function scene.draw()
SCN.scenes.game.draw()
end
--Grey screen cover
--Gray screen cover
gc.setColor(.15,.15,.15,timer*1.26)
gc.push("transform")
gc.origin()

2
parts/scenes/load.lua
View File

@@ -356,7 +356,7 @@ function scene.draw()
setFont(25)
for i=0,26 do
local x,y=light[3*i+1],light[3*i+2]
gc.setColor(COLOR[i==progress and"grey"or light[3*i+3]and"dOrange"or"dGrey"])
gc.setColor(COLOR[i==progress and"gray"or light[3*i+3]and"dOrange"or"dGray"])
gc.circle("fill",x,y,23)
gc.setColor(.16,.16,.16)
gc.circle("line",x,y,23)

2
parts/scenes/main.lua
View File

@@ -177,7 +177,7 @@ scene.widgetList={
WIDGET.newButton{name="custom", x=-1200,y=570,w=800,h=100, color="lSea", font=45,align="R",edge=30, code=pressKey"z"},
WIDGET.newButton{name="setting",x=2480,y=210,w=800,h=100, color="lOrange",font=40,align="L",edge=30, code=pressKey"-"},
WIDGET.newButton{name="stat", x=2480,y=330,w=800,h=100, color="lLame", font=40,align="L",edge=30, code=pressKey"p"},
WIDGET.newButton{name="stat", x=2480,y=330,w=800,h=100, color="lLime", font=40,align="L",edge=30, code=pressKey"p"},
WIDGET.newButton{name="dict", x=2480,y=450,w=800,h=100, color="lGreen", font=40,align="L",edge=30, code=pressKey"l"},
WIDGET.newButton{name="manual", x=2480,y=570,w=800,h=100, color="lC", font=40,align="L",edge=30, code=pressKey","},

2
parts/scenes/net_game.lua
View File

@@ -275,7 +275,7 @@ scene.widgetList={
PLY_NET[1].ready or
NET.getlock("ready")
end},
WIDGET.newKey{name="cancel",x=900,y=560,w=400,h=100,color="grey",font=40,code=pressKey"space",
WIDGET.newKey{name="cancel",x=900,y=560,w=400,h=100,color="gray",font=40,code=pressKey"space",
hide=function()
return
playing or

4
parts/scenes/pause.lua
View File

@@ -6,7 +6,7 @@ local SCR,setFont,mStr=SCR,setFont,mStr
local fnsRankColor={
Z=COLOR.lYellow,
S=COLOR.lGrey,
S=COLOR.lGray,
A=COLOR.sky,
B=COLOR.lGreen,
C=COLOR.magenta,
@@ -38,7 +38,7 @@ function scene.sceneInit(org)
local frameLostRate=(S.frame/S.time/60-1)*100
form={
{COLOR.white,TIMESTR(S.time),COLOR[frameLostRate>10 and"red"or frameLostRate>3 and"yellow"or"grey"],format(" (%.2f%%)",frameLostRate)},
{COLOR.white,TIMESTR(S.time),COLOR[frameLostRate>10 and"red"or frameLostRate>3 and"yellow"or"gray"],format(" (%.2f%%)",frameLostRate)},
format("%d/%d/%d",S.key,S.rotate,S.hold),
format("%d %.2fPPS",S.piece,S.piece/S.time),
format("%d(%d) %.2fLPM",S.row,S.dig,S.row/S.time*60),

8
parts/scenes/test.lua
View File

@@ -24,13 +24,13 @@ function scene.gamepadDown(key)
push("[gamepadDown] <"..key..">")
end
function scene.gamepadUp(key)
push{COLOR.grey,"[gamepadUp] <"..key..">"}
push{COLOR.gray,"[gamepadUp] <"..key..">"}
end
function scene.keyDown(key)
push("[keyDown] <"..key..">")
end
function scene.keyUp(key)
push{COLOR.grey,"[keyUp] <"..key..">"}
push{COLOR.gray,"[keyUp] <"..key..">"}
end
function scene.mouseDown(x,y,k)
push(("[mouseDown] <%d: %d, %d>"):format(k,x,y))
@@ -40,7 +40,7 @@ function scene.mouseMove(x,y)
end
function scene.mouseUp(x,y,k)
SYSFX.newRectRipple(1,x-10,y-10,21,21)
push{COLOR.grey,"[mouseUp] <"..k..">"}
push{COLOR.gray,"[mouseUp] <"..k..">"}
end
function scene.touchClick(x,y)
SYSFX.newRipple(.5,x,y,50)
@@ -55,7 +55,7 @@ function scene.touchMove(x,y)
end
function scene.touchUp(x,y)
SYSFX.newRipple(.5,x,y,50)
push{COLOR.grey,"[touchUp]"}
push{COLOR.gray,"[touchUp]"}
end
function scene.wheelMoved(dx,dy)
push(("[wheelMoved] <%d, %d>"):format(dx,dy))