From 109da7d249391e4e07dfec1d6bdc4b00108f24c0 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sun, 11 Oct 2020 02:03:35 +0800 Subject: [PATCH] =?UTF-8?q?bgm=E5=A4=A7=E8=A7=84=E6=A8=A1=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/bgm.lua | 28 +++++++++++++++++++++------- modes/blind_ultimate.lua | 2 +- modes/blind_wtf.lua | 2 +- modes/defender_lunatic.lua | 2 +- modes/defender_normal.lua | 2 +- modes/dig_hard.lua | 2 +- modes/survivor_hard.lua | 2 +- modes/survivor_lunatic.lua | 2 +- modes/survivor_normal.lua | 2 +- modes/survivor_ultimate.lua | 2 +- modes/tech_finesse.lua | 2 +- modes/tech_hard.lua | 2 +- modes/tech_hard2.lua | 2 +- modes/tsd_easy.lua | 2 +- modes/tsd_hard.lua | 2 +- modes/tsd_ultimate.lua | 2 +- 16 files changed, 36 insertions(+), 22 deletions(-) diff --git a/Zframework/bgm.lua b/Zframework/bgm.lua index 8e2f5bec..049b4723 100644 --- a/Zframework/bgm.lua +++ b/Zframework/bgm.lua @@ -24,13 +24,27 @@ local BGM={ --playing=[src:playing SRC] } BGM.list={ - "blank", - "race","push","way","reason", - "newera","oxygen","infinite","down", - "secret7th","secret8th", - "waterfall","shining terminal","distortion","far","storm", - "rockblock","cruelty","final","8-bit happiness","end", - "how feeling", + "blank",--menu + "race",--sprint, solo + "infinite",--infinite norm/dig, ultra, zen, tech-finesse + "push",--marathon, round, tsd, blind-5/6 + "way",--dig sprint + "reason",--drought, blind-1/2/3/4 + + "secret8th",--master-1, survivor-2 + "secret7th",--master-2, survivor-3 + "waterfall",--sprint Penta/MPH + "newera",--bigbang, pc challenge, survivor-1, tech-normal + "oxygen",--c4w/pc train + + "distortion",--master-3 + "far",--GM + "shining terminal",--attacker + "storm",--defender, survivor-4/5 + "down",--dig, tech-hard/lunatic + + "rockblock",--classic, 49/99 + "cruelty","final","8-bit happiness","end","how feeling",--49/99 } BGM.len=#BGM.list function BGM.loadOne(N) diff --git a/modes/blind_ultimate.lua b/modes/blind_ultimate.lua index a0061ca5..211ddeab 100644 --- a/modes/blind_ultimate.lua +++ b/modes/blind_ultimate.lua @@ -11,7 +11,7 @@ return{ dropPiece=PLY.check_lineReach, freshLimit=15, target=200, - bg="rgb",bgm="way", + bg="rgb",bgm="push", }, pauseLimit=true, load=function() diff --git a/modes/blind_wtf.lua b/modes/blind_wtf.lua index 9b1c2c9e..7a618d5b 100644 --- a/modes/blind_wtf.lua +++ b/modes/blind_wtf.lua @@ -12,7 +12,7 @@ return{ dropPiece=PLY.check_lineReach, freshLimit=15, target=100, - bg="none",bgm="way", + bg="none",bgm="push", }, pauseLimit=true, load=function() diff --git a/modes/defender_lunatic.lua b/modes/defender_lunatic.lua index b59fe18d..9741b8da 100644 --- a/modes/defender_lunatic.lua +++ b/modes/defender_lunatic.lua @@ -47,7 +47,7 @@ return{ setFont(55) mStr(P.modeData.event,69,270) mStr(P.modeData.point,69,390) - mText(drawableText.wave,69,350) + mText(drawableText.wave,69,330) mText(drawableText.rpm,69,450) end, score=function(P)return{P.modeData.event,P.stat.time}end, diff --git a/modes/defender_normal.lua b/modes/defender_normal.lua index 1851d8e2..2578632c 100644 --- a/modes/defender_normal.lua +++ b/modes/defender_normal.lua @@ -47,7 +47,7 @@ return{ setFont(55) mStr(P.modeData.event,69,270) mStr(P.modeData.point,69,390) - mText(drawableText.wave,69,350) + mText(drawableText.wave,69,330) mText(drawableText.rpm,69,450) end, score=function(P)return{P.modeData.event,P.stat.time}end, diff --git a/modes/dig_hard.lua b/modes/dig_hard.lua index d407c8ac..4eb51fa7 100644 --- a/modes/dig_hard.lua +++ b/modes/dig_hard.lua @@ -16,7 +16,7 @@ return{ D.event=D.event+1 end end, - bg="bg2",bgm="way", + bg="bg2",bgm="down", }, pauseLimit=true, load=function() diff --git a/modes/survivor_hard.lua b/modes/survivor_hard.lua index c4c5d86a..c2528c0b 100644 --- a/modes/survivor_hard.lua +++ b/modes/survivor_hard.lua @@ -22,7 +22,7 @@ return{ P.modeData.event=P.modeData.event+1 end end, - bg="glow",bgm="newera", + bg="glow",bgm="secret7th", }, pauseLimit=true, load=function() diff --git a/modes/survivor_lunatic.lua b/modes/survivor_lunatic.lua index 4bfe7252..2079b647 100644 --- a/modes/survivor_lunatic.lua +++ b/modes/survivor_lunatic.lua @@ -17,7 +17,7 @@ return{ P.modeData.event=P.modeData.event+1 end end, - bg="glow",bgm="secret8th", + bg="glow",bgm="storm", }, pauseLimit=true, load=function() diff --git a/modes/survivor_normal.lua b/modes/survivor_normal.lua index 323ee9d3..efb4543a 100644 --- a/modes/survivor_normal.lua +++ b/modes/survivor_normal.lua @@ -21,7 +21,7 @@ return{ P.modeData.event=d end end, - bg="glow",bgm="newera", + bg="glow",bgm="secret8th", }, pauseLimit=true, load=function() diff --git a/modes/survivor_ultimate.lua b/modes/survivor_ultimate.lua index 33c57fe5..6bc7b698 100644 --- a/modes/survivor_ultimate.lua +++ b/modes/survivor_ultimate.lua @@ -23,7 +23,7 @@ return{ P.modeData.event=P.modeData.event+1 end end, - bg="rgb",bgm="secret7th", + bg="rgb",bgm="storm", }, pauseLimit=true, load=function() diff --git a/modes/tech_finesse.lua b/modes/tech_finesse.lua index 6215600d..c5a1ad38 100644 --- a/modes/tech_finesse.lua +++ b/modes/tech_finesse.lua @@ -23,7 +23,7 @@ return{ mText(drawableText.eff,69,433) end, score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.time}end, - scoreDisp=function(D)return D[1].." "..toTime(D[2])end, + scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]