修关闭节日主题时特定条件无法启动

This commit is contained in:
MrZ_26
2024-11-01 03:26:37 +08:00
parent fe12f397cc
commit 45a4b10d11

View File

@@ -62,11 +62,11 @@ function THEME.calculate(Y,M,D)
) )
end end
function THEME.set(theme,keepBGM) function THEME.set(theme,keepBGM,force)
if type(theme)=='string' and theme:sub(1,6)=='season' then if type(theme)=='string' and theme:sub(1,6)=='season' then
BG.setDefault(SETTING.defaultBG) BG.setDefault(SETTING.defaultBG)
BGM.setDefault(({season1='null',season2='nil',season3='vacuum',season4='space'})[theme]) BGM.setDefault(({season1='null',season2='nil',season3='vacuum',season4='space'})[theme])
elseif not SETTING.noTheme then elseif not SETTING.noTheme or force then
if theme=='xmas' then if theme=='xmas' then
BG.setDefault('snow') BG.setDefault('snow')
BGM.setDefault('xmas') BGM.setDefault('xmas')
@@ -102,7 +102,7 @@ function THEME.set(theme,keepBGM)
return return
end end
else else
return THEME.set(THEME.calculate('0',os.date('%m'),'0')) return THEME.set(THEME.calculate('0',os.date('%m'),'0'),keepBGM,true)
end end
THEME.cur=theme THEME.cur=theme