exterior设置中的测试按钮不再隐藏，但游戏中不能按

应用高级音频设置的按钮同上
26F-Studio · Apr 20, 2024 · 1bc3cb3 · 1bc3cb3
1 parent 16c1e68
commit 1bc3cb3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/assets/language/lang_en.lua b/assets/language/lang_en.lua
@@ -86,6 +86,8 @@ return {
     setting_enableTouching="Enable touch control",
     setting_touching="Touch controls…",
     setting_test="Test",
+    setting_tryTestInGame="Cannot test during game",
+    setting_tryApplyAudioInGame="Cannot apply during game",
 
     setting_sysCursor="External cursor",
     setting_clickFX="Click FX",

diff --git a/assets/language/lang_zh.lua b/assets/language/lang_zh.lua
@@ -86,6 +86,8 @@ return {
     setting_enableTouching="启用触屏控制",
     setting_touching="触屏控制...",
     setting_test="测试",
+    setting_tryTestInGame="不能在游戏中途测试",
+    setting_tryApplyAudioInGame="不能在游戏中途应用",
 
     setting_sysCursor="使用外部光标",
     setting_clickFX="点击动画",

diff --git a/assets/scene/keyset_out.lua b/assets/scene/keyset_out.lua
@@ -130,7 +130,7 @@ scene.widgetList={
     {type='button_invis',name='Smino',pos={1,0},x=-400,y=60,w=150,h=100,cornerR=20,fontSize=60,text="M",fontType='bold',sound_trigger='button_soft',code=function() if keyMode~='mino' then scene.enter('mino') end end,visibleFunc=function() return PROGRESS.getModeUnlocked('mino_stdMap') end},
     {type='button_invis',name='Ssys', pos={1,0},x=-200,y=60,w=150,h=100,cornerR=20,fontSize=60,text="S",fontType='bold',sound_trigger='button_soft',code=function() if keyMode~='sys'  then scene.enter('sys')  end end},
 
-    {type='button',pos={1,1},x=-300,y=-80,w=160,h=80,text=LANG"setting_test",fontSize=40,code=playExterior'mino/exterior/test',visibleFunc=function() return not GAME.mode end},
+    {type='button',pos={1,1},x=-300,y=-80,w=160,h=80,text=LANG"setting_test",fontSize=40,code=playExterior('mino/exterior/test'),visibleFunc=function() return not GAME.mode end},
     {type='text',pos={0,0},x=240,y=60,alignX='left',fontType='bold',fontSize=60,text=LANG'settings_title'},
     {type='button_fill',pos={0,0},x=120,y=60,w=180,h=70,color='B',cornerR=15,sound_trigger='button_back',fontSize=40,text=backText,code=WIDGET.c_backScn'fadeHeader'},
 }

diff --git a/assets/scene/setting_out.lua b/assets/scene/setting_out.lua
@@ -22,7 +22,6 @@ function scene.enter()
         scene.widgetList["3f"]:setVisible(not MOBILE)
         scene.widgetList["3p"]:setVisible(MOBILE)
     end
-    scene.widgetList.test:setVisible(not GAME.mode)
     WIDGET._reset()
     BG.set('none')
 end
@@ -78,6 +77,7 @@ scene.widgetList={
     {name='2',type='slider',     pos={0,0},x=340, y=730,w=390, fontSize=30,text=LANG'setting_fmod_DSPBufferCount',  widthLimit=260, axis={2,8,1},                                              disp=TABLE.func_getVal(SETTINGS.system,'fmod_DSPBufferCount'),                    code=TABLE.func_setVal(SETTINGS.system,'fmod_DSPBufferCount')},
     {name='2',type='slider',     pos={0,0},x=340, y=800,w=650, fontSize=30,text=LANG'setting_fmod_DSPBufferLength', widthLimit=260, axis={3,16,1},valueShow=function(S) return 2^S.disp() end, disp=function() return MATH.roundLog(SETTINGS.system.fmod_DSPBufferLength,2) end, code=function(v) SETTINGS.system.fmod_DSPBufferLength=2^v end},
     {name='2',type='button',     pos={0,0},x=400, y=870,w=140, h=60,fontSize=30,text=LANG'setting_apply', code=function()
+        if GAME.mode then return MSG.new('warn',Text.setting_tryApplyAudioInGame) end
         FMODLoadFunc()
         FMOD.setMainVolume(SETTINGS.system.mainVol,true)
         stopBgm()
@@ -101,6 +101,11 @@ scene.widgetList={
     -- Gameplay
     -- ?
 
-    {name='test',type='button', pos={1,1},x=-300,y=-80,w=160, h=80,cornerR=10, fontSize=40,text=LANG'setting_test',code=playExterior'mino/exterior/test',visibleFunc=function() return not GAME.mode end},
+    {name='test',type='button', pos={1,1},x=-300,y=-80,w=160, h=80,cornerR=10, fontSize=40,text=LANG'setting_test',
+        code=function()
+            if GAME.mode then return MSG.new('warn',Text.setting_tryTestInGame) end
+            playExterior('mino/exterior/test')()
+        end,
+    },
 }
 return scene