+ proper lines anim
This commit is contained in:
parent
b851b9a379
commit
7d568b5cd0
|
@ -23,7 +23,8 @@ local bestScoreBadgeImage = gfx.CreateSkinImage("result/best.png", 0);
|
||||||
|
|
||||||
local appealCardImage = gfx.CreateSkinImage("appeal_card.png", 0);
|
local appealCardImage = gfx.CreateSkinImage("appeal_card.png", 0);
|
||||||
local danBadgeImage = gfx.CreateSkinImage("dan/inf.png", 0);
|
local danBadgeImage = gfx.CreateSkinImage("dan/inf.png", 0);
|
||||||
local volforceBadgeImage = gfx.CreateSkinImage("volforce/10.png", 0);
|
|
||||||
|
local badgeLines = gfx.CreateSkinImage("result/badge_lines.png", 0);
|
||||||
|
|
||||||
local gradeImages = {
|
local gradeImages = {
|
||||||
S = gfx.CreateSkinImage("common/grades/S.png", 0),
|
S = gfx.CreateSkinImage("common/grades/S.png", 0),
|
||||||
|
@ -98,18 +99,19 @@ local clearBadgeImages = {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
image = gfx.CreateSkinImage("result/clears/AUTOPLAY.png", 0),
|
image = gfx.CreateSkinImage("result/clears/AUTOPLAY.png", 0),
|
||||||
xPos = 1080
|
xPos = 1100
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
-- ANIMS
|
-- ANIMS
|
||||||
local idolAnimation = gfx.LoadSkinAnimation('idol', 1 / 30, 0, true);
|
local idolAnimation = gfx.LoadSkinAnimation('idol', 1 / 30, 0, true);
|
||||||
-- added new
|
|
||||||
local RightPanelAni = gfx.LoadSkinAnimation("result/diagonal anims", 1 / 30, 0, true)
|
|
||||||
--
|
|
||||||
local transitionEnterScale = 0;
|
local transitionEnterScale = 0;
|
||||||
local idolAnimTransitionScale = 0;
|
local idolAnimTransitionScale = 0;
|
||||||
|
|
||||||
|
local badgeLinesAnimScale = 0;
|
||||||
|
local badgeLinesAnimOffsetX = 0;
|
||||||
|
|
||||||
local rightPanelX = 0;
|
local rightPanelX = 0;
|
||||||
local rightPanelY = 910;
|
local rightPanelY = 910;
|
||||||
|
|
||||||
|
@ -221,24 +223,11 @@ local drawIdol = function(deltaTime)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--added code
|
|
||||||
local drawRightBarAni = function(deltaTime)
|
local drawRightBarAni = function(deltaTime)
|
||||||
local idolAnimTickRes = gfx.TickAnimation(RightPanelAni, deltaTime);
|
-- badgeLines
|
||||||
if idolAnimTickRes == 1 then
|
|
||||||
gfx.GlobalAlpha(idolAnimTransitionScale);
|
|
||||||
|
|
||||||
idolAnimTransitionScale = idolAnimTransitionScale + 1 / 60;
|
|
||||||
if (idolAnimTransitionScale > 1) then
|
|
||||||
idolAnimTransitionScale = 1;
|
|
||||||
end
|
|
||||||
|
|
||||||
local tw, th = gfx.ImageSize(RightPanelAni);
|
|
||||||
gfx.BeginPath();
|
gfx.BeginPath();
|
||||||
gfx.ImageRect(rightPanelX + 1080 - tw, rightPanelY + 5, tw * 1,
|
gfx.ImageRect(rightPanelX + 1080 - 531 + badgeLinesAnimOffsetX, rightPanelY + 5, 531, 85, badgeLines, 1, 0);
|
||||||
th * 1, RightPanelAni, 1, 0);
|
|
||||||
end
|
end
|
||||||
end
|
|
||||||
--
|
|
||||||
|
|
||||||
local drawTopBar = function()
|
local drawTopBar = function()
|
||||||
gfx.BeginPath();
|
gfx.BeginPath();
|
||||||
|
@ -548,6 +537,14 @@ local tickTransitions = function(deltaTime)
|
||||||
|
|
||||||
jacketPanelX = 40 + (JACKET_PANEL_TRANSTION_ENTER_OFFSET *
|
jacketPanelX = 40 + (JACKET_PANEL_TRANSTION_ENTER_OFFSET *
|
||||||
(1 - Easing.outQuad(transitionEnterScale)))
|
(1 - Easing.outQuad(transitionEnterScale)))
|
||||||
|
|
||||||
|
|
||||||
|
if badgeLinesAnimScale < 1 then
|
||||||
|
badgeLinesAnimScale = badgeLinesAnimScale + deltaTime / 0.5 -- transition should last for that time in seconds
|
||||||
|
else
|
||||||
|
badgeLinesAnimScale = 0
|
||||||
|
end
|
||||||
|
badgeLinesAnimOffsetX = 16 * (1-badgeLinesAnimScale);
|
||||||
end
|
end
|
||||||
|
|
||||||
result_set = function()
|
result_set = function()
|
||||||
|
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 7.0 KiB |
Loading…
Reference in New Issue