对战房间背景和音乐不再能自定义,都改为列表随机

This commit is contained in:
MrZ626
2021-08-01 19:47:59 +08:00
parent 0b9006faf3
commit a30c0395aa
9 changed files with 7 additions and 26 deletions

View File

@@ -528,7 +528,9 @@ do--function resetGameData(args)
MES.new('error',"Wrong task type")
end
end
BG.set(GAME.modeEnv.bg)
local bg=GAME.modeEnv.bg
BG.set(type(bg)=='string'and bg or type(bg)=='table'and bg[math.random(#bg)])
local bgm=GAME.modeEnv.bgm
BGM.play(type(bgm)=='string'and bgm or type(bgm)=='table'and bgm[math.random(#bgm)])

View File

@@ -237,10 +237,6 @@ ROOMENV={
b2bKill=false,
easyFresh=true,
deepDrop=false,
--Else
bg='blockfall',
bgm='battle',
}
SETTING={--Settings
--Tuning

View File

@@ -294,9 +294,6 @@ return{
holdCount="Hold",
infHold="Infinite Hold",
phyHold="In-place Hold",
bg="Background",
bgm="Music",
},
net_game={
ready="Ready",

View File

@@ -260,9 +260,6 @@ return{
holdCount="Reserva",
infHold="Reserva Inft.",
phyHold="Reserva Limit.",
bg="Fundo",
bgm="Música",
},
net_game={
ready="Estoy Listo",

View File

@@ -256,9 +256,6 @@ return{
holdCount="Réserve",
infHold="Réserver une fois",
-- phyHold="Physical Hold",
bg="Arrière-plan",
bgm="Musique",
},
net_game={
-- ready="Ready",

View File

@@ -284,9 +284,6 @@ return{
holdCount="Segurar",
infHold="Segurar Infinito",
-- phyHold="Physical Hold",
bg="Fundo",
bgm="Música",
},
net_game={
-- ready="Ready",

View File

@@ -294,9 +294,6 @@ return{
holdCount="Hold",
infHold="无限Hold",
phyHold="物理Hold",
bg="背景",
bgm="音乐",
},
net_game={
ready="准备",

View File

@@ -8,9 +8,11 @@ local function marginTask(P)
end
return{
color=COLOR.white,
env={},
env={
bg={'bg1','bg2','blackhole','blockfall','blockrain','blockspace','cubes','fan','flink','glow','lightning','matrix','rainbow','rainbow2','rgb','tunnel','welcome'},
bgm={'battle','beat5th','cruelty','distortion','echo','far','final','here','hope','memory','moonbeam','push','rectification','secret7th remix','secret7th','secret8th remix','secret8th','shift','shining terminal','storm','super7th','there','truth','vapor','warped','waterfall'},
},
load=function()
TABLE.clear(GAME.modeEnv)
for k,v in next,NET.roomState.roomData do
GAME.modeEnv[k]=v
end

View File

@@ -105,10 +105,6 @@ scene.widgetList={
WIDGET.newSlider{name="holdCount", x=120,y=1030,w=200,unit=6, disp=ROOMval("holdCount"),code=ROOMsto("holdCount")},
WIDGET.newSwitch{name="infHold", x=560,y=940, disp=ROOMval("infHold"),code=ROOMrev("infHold"),hideF=function()return ROOMENV.holdCount==0 end},
WIDGET.newSwitch{name="phyHold", x=560,y=1030, disp=ROOMval("phyHold"),code=ROOMrev("phyHold"),hideF=function()return ROOMENV.holdCount==0 end},
--BG & BGM
WIDGET.newSelector{name="bg", x=840, y=1030,w=250,color='Y',list=BG.getList(),disp=ROOMval("bg"),code=function(i)ROOMENV.bg=i BG.set(i)end},
WIDGET.newSelector{name="bgm", x=1120, y=1030,w=250,color='Y',list=BGM.getList(),disp=ROOMval("bgm"),code=function(i)ROOMENV.bgm=i BGM.play(i)end},
}
return scene