From 7e90211428cfd149e5e07beb9d5349e53cfc9e91 Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Sat, 28 Sep 2024 21:15:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AEinterior=E8=AE=A1=E5=88=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/game/mode/brik/interior/marathon.lua | 4 ++-- assets/game/mode/brik/interior/sprint.lua | 4 ++-- assets/progress.lua | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/assets/game/mode/brik/interior/marathon.lua b/assets/game/mode/brik/interior/marathon.lua index 944d6966..3f06362f 100644 --- a/assets/game/mode/brik/interior/marathon.lua +++ b/assets/game/mode/brik/interior/marathon.lua @@ -57,8 +57,8 @@ return { result=function() local P=GAME.mainPlayer if not P then return end - PROGRESS.setInteriorScore('sprint',math.min(P.stat.line*4/3,40)) - MATH.lLerp({0,40,90,120,160},MATH.ilLerp({0,40,80,130,200},P.stat.line)) + PROGRESS.setInteriorScore('sprint',MATH.clamp(P.stat.line*4/3,0,40)) + PROGRESS.setInteriorScore('marathon',MATH.lLerp({0,40,90,120,160},MATH.ilLerp({0,40,80,130,200},P.stat.line))) end, resultPage=function(time) local P=GAME.mainPlayer diff --git a/assets/game/mode/brik/interior/sprint.lua b/assets/game/mode/brik/interior/sprint.lua index d2ea14cc..82dd745b 100644 --- a/assets/game/mode/brik/interior/sprint.lua +++ b/assets/game/mode/brik/interior/sprint.lua @@ -33,8 +33,8 @@ return { PROGRESS.setInteriorScore('marathon',30) PROGRESS.setInteriorScore('sprint',MATH.lLerp({200,140,90,40},MATH.ilLerp({60e3,90e3,180e3,300e3},P.gameTime))) else - PROGRESS.setInteriorScore('marathon',P.stat.line*0.75) - PROGRESS.setInteriorScore('sprint',P.stat.line) + PROGRESS.setInteriorScore('marathon',MATH.clamp(P.stat.line*0.75,0,200)) + PROGRESS.setInteriorScore('sprint',MATH.clamp(P.stat.line,0,200)) end end, resultPage=function(time) diff --git a/assets/progress.lua b/assets/progress.lua index 040fcf7d..61149b86 100644 --- a/assets/progress.lua +++ b/assets/progress.lua @@ -499,7 +499,6 @@ end ---@param sign? '<'|'>' #default to `'>'` bigger=better, `'<'` smaller=better function PROGRESS.setInteriorScore(mode,score,sign) sign=sign or '>' - score=MATH.clamp(math.floor(score),0,260) if not prgs.interiorScore[mode] or sign=='>' and score>prgs.interiorScore[mode] or sign=='<' and score