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

整理玩家特效相关的生成代码，修复主菜单Demo玩家复活动画坐标不正确

Browse Source
This commit is contained in:
MrZ626
2020-11-20 11:19:11 +08:00
parent 8a9ae47d41
commit aa0f2ccdc6
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
parts/player/init.lua
View File

@@ -95,21 +95,21 @@ local function newEmptyPlayer(id,x,y,size)
P.small=P.size<.1--If draw in small mode P.small=P.size<.1--If draw in small mode
if P.small then if P.small then
P.fieldX,P.fieldY=P.x,P.y
P.centerX,P.centerY=P.x+300*P.size,P.y+600*P.size P.centerX,P.centerY=P.x+300*P.size,P.y+600*P.size
P.canvas=love.graphics.newCanvas(60,120) P.canvas=love.graphics.newCanvas(60,120)
P.frameWait=rnd(30,120) P.frameWait=rnd(30,120)
P.draw=PLY.draw.small P.draw=PLY.draw.small
else else
P.keyRec=true--If calculate keySpeed P.keyRec=true--If calculate keySpeed
P.fieldX,P.fieldY=P.x+150*P.size,P.y+70*P.size
P.centerX,P.centerY=P.x+300*P.size,P.y+370*P.size P.centerX,P.centerY=P.x+300*P.size,P.y+370*P.size
P.absFieldX=P.x+150*P.size P.absFieldX,P.absFieldY=P.x+150*P.size,P.y+60*P.size
P.absFieldY=P.y+60*P.size
P.draw=PLY.draw.norm P.draw=PLY.draw.norm
P.bonus={}--Text objects P.bonus={}--Text objects
end end
P.randGen=mt.newRandomGenerator(GAME.seed) P.randGen=mt.newRandomGenerator(GAME.seed)
P.small=false
P.alive=true P.alive=true
P.control=false P.control=false
P.timing=false P.timing=false
@@ -269,12 +269,19 @@ local function applyGameEnv(P)--Finish gameEnv processing
if ENV.nextCount==0 then ENV.nextPos=false end if ENV.nextCount==0 then ENV.nextPos=false end
if ENV.lockFX==0 then ENV.lockFX=nil end if P.small then
if ENV.dropFX==0 then ENV.dropFX=nil end ENV.lockFX=nil
if ENV.moveFX==0 then ENV.moveFX=nil end ENV.dropFX=nil
if ENV.clearFX==0 then ENV.clearFX=nil end ENV.moveFX=nil
if ENV.shakeFX==0 then ENV.shakeFX=nil end ENV.clearFX=nil
ENV.shakeFX=nil
else
if ENV.lockFX==0 then ENV.lockFX=nil end
if ENV.dropFX==0 then ENV.dropFX=nil end
if ENV.moveFX==0 then ENV.moveFX=nil end
if ENV.clearFX==0 then ENV.clearFX=nil end
if ENV.shakeFX==0 then ENV.shakeFX=nil end
end
if ENV.ghost==0 then ENV.ghost=nil end if ENV.ghost==0 then ENV.ghost=nil end
if ENV.center==0 then ENV.center=nil end if ENV.center==0 then ENV.center=nil end
end end
@@ -304,10 +311,9 @@ function PLY.newDemoPlayer(id,x,y,size)
P.sound=true P.sound=true
-- rewrite some args -- rewrite some args
P.small=false P.fieldX,P.fieldY=P.x,P.y
P.centerX,P.centerY=P.x+300*P.size,P.y+600*P.size P.centerX,P.centerY=P.x+300*P.size,P.y+600*P.size
P.absFieldX=P.x+150*P.size P.absFieldX,P.absFieldY=P.x+150*P.size,P.y+60*P.size
P.absFieldY=P.y+60*P.size
P.draw=PLY.draw.demo P.draw=PLY.draw.demo
P.control=true P.control=true
GAME.modeEnv=DemoEnv GAME.modeEnv=DemoEnv
@@ -335,6 +341,7 @@ function PLY.newRemotePlayer(id,x,y,size)
applyGameEnv(P) applyGameEnv(P)
prepareSequence(P) prepareSequence(P)
end end
function PLY.newAIPlayer(id,x,y,size,AIdata) function PLY.newAIPlayer(id,x,y,size,AIdata)
local P=newEmptyPlayer(id,x,y,size) local P=newEmptyPlayer(id,x,y,size)
@@ -342,13 +349,6 @@ function PLY.newAIPlayer(id,x,y,size,AIdata)
local ENV=P.gameEnv local ENV=P.gameEnv
ENV.face={0,0,0,0,0,0,0} ENV.face={0,0,0,0,0,0,0}
ENV.skin={1,7,11,3,14,4,9} ENV.skin={1,7,11,3,14,4,9}
if P.small then
ENV.text=false
ENV.lockFX=nil
ENV.dropFX=nil
ENV.moveFX=nil
ENV.shakeFX=nil
end
applyGameEnv(P) applyGameEnv(P)
prepareSequence(P) prepareSequence(P)
P:loadAI(AIdata) P:loadAI(AIdata)

9
parts/player/player.lua
View File

@@ -1427,7 +1427,8 @@ function Player.lose(P,force)
if P.result then return end if P.result then return end
if P.life>0 and not force then if P.life>0 and not force then
P.waiting=62 P.waiting=62
for _=#P.field,1,-1 do local h=#P.field
for _=h,1,-1 do
FREEROW.discard(P.field[_]) FREEROW.discard(P.field[_])
FREEROW.discard(P.visTime[_]) FREEROW.discard(P.visTime[_])
P.field[_],P.visTime[_]=nil P.field[_],P.visTime[_]=nil
@@ -1452,11 +1453,11 @@ function Player.lose(P,force)
end end
P.atkBuffer.sum=0 P.atkBuffer.sum=0
for i=1,21 do for i=1,h do
P:createClearingFX(i,1.5) P:createClearingFX(i,1.5)
end end
SYSFX.newShade(.7,1,1,1,P.x+150*P.size,P.y+60*P.size,300*P.size,610*P.size) SYSFX.newShade(.7,1,1,1,P.fieldX,P.fieldY,300*P.size,610*P.size)
SYSFX.newRectRipple(.5,P.x+150*P.size,P.y+60*P.size,300*P.size,610*P.size) SYSFX.newRectRipple(.5,P.fieldX,P.fieldY,300*P.size,610*P.size)
SYSFX.newRipple(.5,P.x+(475+25*(P.life<3 and P.life or 0)+12)*P.size,P.y+(665+12)*P.size,20) SYSFX.newRipple(.5,P.x+(475+25*(P.life<3 and P.life or 0)+12)*P.size,P.y+(665+12)*P.size,20)
--300+25*i,595 --300+25*i,595
SFX.play("clear_3") SFX.play("clear_3")