整理注释框架跟进

26F-Studio · Apr 27, 2024 · 571f6e5 · 571f6e5
1 parent 141e061
commit 571f6e5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/Zenitha b/Zenitha
diff --git a/assets/bgmlist.lua b/assets/bgmlist.lua
@@ -211,7 +211,6 @@ return {
     },
     ['shibamata']={
         author="C₂₉H₂₅N₃O₅",
-        plain=true,
     },
     ['race remix']={
         author="柒栎流星",

diff --git a/assets/scene/dictionary.lua b/assets/scene/dictionary.lua
@@ -55,8 +55,8 @@ local currentDict={locale=false}
 -- Dict data of English
 local enDict=FILE.load('assets/language/dict_en.lua','-lua -canskip')
 
-local listBox ---@type Zenitha.widget.listBox
-local inputBox ---@type Zenitha.widget.inputBox
+local listBox ---@type Zenitha.Widget.listBox
+local inputBox ---@type Zenitha.Widget.inputBox
 local linkButton,copyButton
 local function close()
     quiting=true
@@ -166,10 +166,10 @@ do -- Widgets
             selectItem(listBox:getItem())
         end
     end
-    ---@type Zenitha.widget.listBox
+    ---@type Zenitha.Widget.listBox
     listBox=WIDGET.new(listBox)
 
-    ---@type Zenitha.widget.inputBox
+    ---@type Zenitha.Widget.inputBox
     inputBox=WIDGET.new{
         type='inputBox',pos={.5,.5},x=mainX,y=280,w=mainW,h=searchH-10,
         frameColor={0,0,0,0},

diff --git a/assets/scene/musicroom.lua b/assets/scene/musicroom.lua
@@ -64,18 +64,21 @@ local musicListBox do
     function musicListBox.code()
         if selected~=musicListBox:getItem() then
             selected=musicListBox:getItem()
-            if not bgmList[selected].plain and (noProgress or PROGRESS.getBgmUnlocked(selected)==2) then
+            local fullBandMode=not bgmList[selected].plain and (noProgress or PROGRESS.getBgmUnlocked(selected)==2)
+            scene.widgetList.fullband:setVisible(fullBandMode)
+            if fullBandMode then
                 fullband=fullband==true
-                scene.widgetList.fullband:setVisible(true)
             else
                 fullband=nil
-                scene.widgetList.fullband:setVisible(false)
             end
             playBgm(selected,fullband,noProgress)
         end
     end
+    ---@type Zenitha.Widget.listBox
     musicListBox=WIDGET.new(musicListBox)
 end
+
+---@type Zenitha.Widget.slider_progress
 local progressBar=WIDGET.new{type='slider_progress',pos={.5,.5},x=-700,y=230,w=1400,
     disp=function() return fakeProgress end,
     code=function(v,mode)
+2 −2		background.lua
+3 −3		bgm.lua
+2 −2		http.lua
+3 −3		init.lua
+1 −1		scene.lua
+2 −2		text.lua
+2 −2		wait.lua
+27 −27		widget.lua