From dc52aa9d74d0febb9f3ef287cd381aad0b4287e0 Mon Sep 17 00:00:00 2001 From: FajsiEx Date: Thu, 28 Oct 2021 11:12:19 +0200 Subject: [PATCH] * replace the diff rect with component in result --- scripts/result.lua | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/scripts/result.lua b/scripts/result.lua index b61b6c8..32589b6 100644 --- a/scripts/result.lua +++ b/scripts/result.lua @@ -1,6 +1,7 @@ local Easing = require('common.easings'); local Background = require('components.background'); local Footer = require('components.footer'); +local DiffRectangle = require('components.diff_rectangle'); local lang = require("language.call") local creww = game.GetSkinSetting("single_idol") @@ -523,20 +524,22 @@ local drawJacketPanel = function() gfx.ImageRect(jacketPanelX, jacketPanelY, tw, th, jacketPanelImage, 1, 0); end -local drawJacketPanelContent = function() +local drawJacketPanelContent = function(deltaTime) gfx.BeginPath(); gfx.ImageRect(jacketPanelX + 13, jacketPanelY + 28, 265, 265, jacketImage or defaultJacketImage, 1, 0); - gfx.BeginPath(); - gfx.ImageRect(jacketPanelX + 183, jacketPanelY + 2.5, 140 / 1.5, 31 / 1.5, - difficultyLabelImages[result.difficulty + 1] or - difficultyLabelImages[4], 1, 0); + DiffRectangle.render(deltaTime, jacketPanelX+183, jacketPanelY+2.5, 0.67, result.difficulty, result.level); - gfx.FontSize(17) - gfx.LoadSkinFont('Digital-Serial-Bold.ttf') - gfx.TextAlign(gfx.TEXT_ALIGN_RIGHT + gfx.TEXT_ALIGN_MIDDLE) - gfx.Text(result.level, jacketPanelX + 265, jacketPanelY + 13.5); + -- gfx.BeginPath(); + -- gfx.ImageRect(jacketPanelX + 183, jacketPanelY + 2.5, 140 / 1.5, 31 / 1.5, + -- difficultyLabelImages[result.difficulty + 1] or + -- difficultyLabelImages[4], 1, 0); + + -- gfx.FontSize(17) + -- gfx.LoadSkinFont('Digital-Serial-Bold.ttf') + -- gfx.TextAlign(gfx.TEXT_ALIGN_RIGHT + gfx.TEXT_ALIGN_MIDDLE) + -- gfx.Text(result.level, jacketPanelX + 265, jacketPanelY + 13.5); end local IR_HeartbeatResponse = function(res) @@ -709,7 +712,7 @@ render = function(deltaTime, showStats) drawRightPanelContent() drawJacketPanel() - drawJacketPanelContent() + drawJacketPanelContent(deltaTime) drawarn() gfx.GlobalAlpha(1)