整 理 代 码

(应该没有改到字符串里面的东西吧…)起码不直接影响运行
This commit is contained in:
MrZ_26
2022-10-01 11:32:11 +08:00
parent 6e00ff96ec
commit 06f4bb4e1a
236 changed files with 2087 additions and 2114 deletions

View File

@@ -41,7 +41,7 @@ local textColor={
local tileTexts=setmetatable({
[-2]="B",
[-1]="×",
},{__index=function(self,k)self[k]=k return k end})
},{__index=function(self,k) self[k]=k return k end})
local player={x=340,y=90}
@@ -88,17 +88,17 @@ function player:reset()
end
end
self.board[1][1]=false
for _,n in next,{-1,-1,1,1,2,2,3,3}do
for _,n in next,{-1,-1,1,1,2,2,3,3} do
local x,y
repeat
x,y=rnd(6),rnd(6)
until not(x==1 and y==1)and self.board[y][x]==0
until not (x==1 and y==1) and self.board[y][x]==0
self.board[y][x]=n
end
end
function player:merge(b,v,y,x)
if b[y]and v==b[y][x]then
if b[y] and v==b[y][x] then
ins(self.mergedTiles,{y,x})
b[y][x]=0
return 1
@@ -130,13 +130,13 @@ function player:click(y,x)
ins(self.nexts,self:newTile())
end
elseif y~=self.selectY or x~=self.selectX then
if availablePos(self.board[y][x],self.nexts[1])then
if availablePos(self.board[y][x],self.nexts[1]) then
self.selectX,self.selectY=x,y
else
self.selectX,self.selectY=false,false
end
elseif y==self.selectY and x==self.selectX then
if not availablePos(self.board[y][x],self.nexts[1])then return end
if not availablePos(self.board[y][x],self.nexts[1]) then return end
if self.state==0 then
self.state=1
self.startTime=TIME()
@@ -188,16 +188,16 @@ function player:click(y,x)
SFX.play('lock')
if cur>=4 then
SFX.play(
cur>=8 and'ren_mega'or
cur>=7 and'spin_3'or
cur>=6 and'spin_2'or
cur>=5 and'spin_1'or
cur>=8 and 'ren_mega' or
cur>=7 and 'spin_3' or
cur>=6 and 'spin_2' or
cur>=5 and 'spin_1' or
'spin_0'
)
end
else
for i=1,6 do
if TABLE.find(self.board[i],0)then
if TABLE.find(self.board[i],0) then
return
end
end
@@ -247,8 +247,8 @@ function player:drawBoard()
--Board lines
setColor(COLOR.Z)
gc.setLineWidth(2)
for x=1,5 do gc.line(x*100,0,x*100,600)end
for y=1,5 do gc.line(0,y*100,600,y*100)end
for x=1,5 do gc.line(x*100,0,x*100,600) end
for y=1,5 do gc.line(0,y*100,600,y*100) end
gc.setLineWidth(6)
rectangle("line",0,0,600,600)
@@ -280,17 +280,17 @@ function scene.touchClick(x,y)
end
function scene.keyDown(key,isRep)
if isRep then return end
if key=='up'or key=='down'or key=='left'or key=='right'then
if key=='up' or key=='down' or key=='left' or key=='right' then
if not player.selectX then
player.selectX,player.selectY=3,3
else
if key=='up'then player.selectY=math.max(player.selectY-1,1)
elseif key=='down'then player.selectY=math.min(player.selectY+1,6)
elseif key=='left'then player.selectX=math.max(player.selectX-1,1)
elseif key=='right'then player.selectX=math.min(player.selectX+1,6)
if key=='up' then player.selectY=math.max(player.selectY-1,1)
elseif key=='down' then player.selectY=math.min(player.selectY+1,6)
elseif key=='left' then player.selectX=math.max(player.selectX-1,1)
elseif key=='right' then player.selectX=math.min(player.selectX+1,6)
end
end
elseif key=='x'or key=='space'then
elseif key=='x' or key=='space' then
if not player.selectX then
player.selectX,player.selectY=3,3
else
@@ -298,16 +298,16 @@ function scene.keyDown(key,isRep)
player:click(player.selectY,player.selectX)
player.selectY,player.selectX=y,x
end
elseif key=='w'then
elseif key=='w' then
love.mousepressed(love.mouse.getPosition())
elseif key=='z'or key=='q'then
elseif key=='z' or key=='q' then
player:click(1,1)
elseif key=='r'then
if player.state~=1 or tryReset()then
elseif key=='r' then
if player.state~=1 or tryReset() then
player:reset()
end
elseif key=='escape'then
if tryBack()then
elseif key=='escape' then
if tryBack() then
SCN.back()
end
end