diff --git a/Zframework/widget.lua b/Zframework/widget.lua index bd8e64cd..e651f2fb 100644 --- a/Zframework/widget.lua +++ b/Zframework/widget.lua @@ -982,6 +982,8 @@ function WIDGET.set(list) c1,c2,c3=COLOR.red,COLOR.white,COLOR.green elseif FESTIVAL=="sprFes"then c1,c2,c3=COLOR.red,COLOR.orange,COLOR.yellow + else + return end local rnd=math.random for _,W in next,list do diff --git a/main.lua b/main.lua index f03aa50a..de402adc 100644 --- a/main.lua +++ b/main.lua @@ -43,7 +43,13 @@ FESTIVAL=( 42,32,50,39,28,46,35,24,43,33, 21,40, })[os.date"%Y"-2000]or -26)-((os.date"%m"-1)*31+os.date"%d"))<6 and - "sprFes" + "sprFes"or + + --Z day (Feb./Mar./Apr./May./June 26) + math.abs(os.date"%m"-4)<=2 and os.date"%d"+0==26 and + "zDay"or + + false ) math.randomseed(os.time()*626) @@ -408,6 +414,9 @@ if FESTIVAL=="Xmas"then elseif FESTIVAL=="sprFes"then BG.setDefault("firework") BGM.setDefault("spring festival") +elseif FESTIVAL=="zDay"then + BG.setDefault("lanterns") + BGM.setDefault("overzero") else BG.setDefault("space") BGM.setDefault("blank") diff --git a/media/BGM/overzero.ogg b/media/BGM/overzero.ogg new file mode 100644 index 00000000..f90622e8 Binary files /dev/null and b/media/BGM/overzero.ogg differ diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua index ee30364d..1403af7a 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -63,6 +63,7 @@ local eggInput={ BGM.setDefault("blank") BGM.play() end, + normal="classic", xmas=function() FESTIVAL="xMas" BG.setDefault("snow")