diff --git a/conf.lua b/conf.lua index 19c390b5..f0ff9657 100644 --- a/conf.lua +++ b/conf.lua @@ -1,51 +1,48 @@ -function love.conf(t) - for k, v in pairs(love) do print(k, v) end - print('\n\n\n') +SYSTEM=love._os if SYSTEM=='OS X' then SYSTEM='macOS' end +MOBILE=SYSTEM=='Android' or SYSTEM=='iOS' +FNNS=SYSTEM:find'\79\83'-- What does FNSF stand for? IDK so don't ask me lol - SYSTEM=love._os if SYSTEM=='OS X' then SYSTEM='macOS' end - MOBILE=SYSTEM == 'Android' or SYSTEM == 'iOS' - FNNS=SYSTEM:find'\79\83'-- What does FNSF stand for? IDK so don't ask me lol - - t.identity = 'Techmino' -- Saving folder - t.version = "11.4" - t.gammacorrect = false - t.appendidentity = true -- Search files in source then in save directory - t.accelerometerjoystick = false -- Accelerometer=joystick on ios/android +function love.conf(t) + t.identity='Techmino' -- Saving folder + t.version="11.4" + t.gammacorrect=false + t.appendidentity=true -- Search files in source then in save directory + t.accelerometerjoystick=false -- Accelerometer=joystick on ios/android if t.audio then - t.audio.mic = false - t.audio.mixwithsystem = true + t.audio.mic=false + t.audio.mixwithsystem=true end - local W = t.window - W.title = "Techmino " .. require "version".string - W.width, W.height = 1280, 720 - W.minwidth, W.minheight = 640, 360 - - W.vsync = 0 -- Unlimited FPS - W.msaa = 16 -- Multi-sampled antialiasing - W.depth = 0 -- Bits/samp of depth buffer - W.stencil = 1 -- Bits/samp of stencil buffer - W.display = 1 -- Monitor ID - W.highdpi = true -- High-dpi mode for the window on a Retina display - W.x, W.y = nil, nil -- Position of the window + local W=t.window + W.title="Techmino "..require "version".string + W.width,W.height=1280,720 + W.minwidth,W.minheight=640,360 + + W.vsync=0 -- Unlimited FPS + W.msaa=0 -- Multi-sampled antialiasing + W.depth=0 -- Bits/samp of depth buffer + W.stencil=1 -- Bits/samp of stencil buffer + W.display=1 -- Monitor ID + W.highdpi=true -- High-dpi mode for the window on a Retina display + W.x,W.y=nil,nil -- Position of the window if love.filesystem.getInfo('media/image/icon.png') then - W.icon = 'media/image/icon.png' + W.icon='media/image/icon.png' end if MOBILE then - W.borderless = true - W.resizable = false - W.fullscreen = true + W.borderless=true + W.resizable=false + W.fullscreen=true else - W.borderless = false - W.resizable = true - W.fullscreen = false + W.borderless=false + W.resizable=true + W.fullscreen=false end - - local M = t.modules - M.window, M.system, M.event, M.thread = true, true, true, true - M.timer, M.math, M.data = true, true, true - M.video, M.audio, M.sound = true, true, true - M.graphics, M.font, M.image = true, true, true - M.mouse, M.touch, M.keyboard, M.joystick = true, true, true, true - M.physics = false + + local M=t.modules + M.window,M.system,M.event,M.thread=true,true,true,true + M.timer,M.math,M.data=true,true,true + M.video,M.audio,M.sound=true,true,true + M.graphics,M.font,M.image=true,true,true + M.mouse,M.touch,M.keyboard,M.joystick=true,true,true,true + M.physics=false end diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index 7e419500..f803a23b 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -78,10 +78,10 @@ scene.widgetList={ WIDGET.newSwitch{name='highCam', x=450,y=1270,lim=360,disp=SETval('highCam'), code=SETrev('highCam')}, WIDGET.newSwitch{name='warn', x=450,y=1340,lim=360,disp=SETval('warn'), code=SETrev('warn')}, - WIDGET.newSwitch{name='clickFX', x=950,y=980,lim=360,disp=SETval('clickFX'), code=function() SETTING.clickFX=not SETTING.clickFX applySettings() end}, - WIDGET.newSwitch{name='power', x=950,y=1070,lim=360,disp=SETval('powerInfo'), code=function() SETTING.powerInfo=not SETTING.powerInfo applySettings() end}, - WIDGET.newSwitch{name='clean', x=950,y=1160,lim=360,disp=SETval('cleanCanvas'), code=function() SETTING.cleanCanvas=not SETTING.cleanCanvas applySettings() end}, - WIDGET.newSwitch{name='fullscreen', x=950,y=1250,lim=360,disp=SETval('fullscreen'),hideF=function() return MOBILE end,code=function() SETTING.fullscreen=not SETTING.fullscreen applySettings() end}, + WIDGET.newSwitch{name='clickFX', x=950,y=980,lim=360,disp=SETval('clickFX'), code=function() SETTING.clickFX=not SETTING.clickFX applySettings() end}, + WIDGET.newSwitch{name='power', x=950,y=1070,lim=360,disp=SETval('powerInfo'), code=function() SETTING.powerInfo=not SETTING.powerInfo applySettings() end}, + WIDGET.newSwitch{name='clean', x=950,y=1160,lim=360,disp=SETval('cleanCanvas'), code=function() SETTING.cleanCanvas=not SETTING.cleanCanvas applySettings() end}, + WIDGET.newSwitch{name='fullscreen', x=950,y=1250,lim=360,disp=SETval('fullscreen'), code=function() SETTING.fullscreen=not SETTING.fullscreen applySettings() end,hideF=function() return MOBILE end}, WIDGET.newKey{name='bg_on', x=680,y=1340,w=200,h=80,code=function() SETTING.bg='on'applySettings() end}, WIDGET.newKey{name='bg_off', x=900,y=1340,w=200,h=80,code=function() SETTING.bg='off'applySettings() end}, diff --git a/parts/updateLog.lua b/parts/updateLog.lua index 51a58a7d..1c2cc683 100644 --- a/parts/updateLog.lua +++ b/parts/updateLog.lua @@ -3,9 +3,12 @@ return[=[ 正在点亮科技树... 0.17.10: 暂停 Break - 新增: - 不允许移动端退出全屏模式 - 抗锯齿和垂直同步设置选项 + 改动: + 添加抗锯齿和横竖屏的设置选项 + 丢失的文本会显示为内部名称而不是神秘符号 + 修复: + 调整galaxy和quarks背景的粒子颜色,减少对游戏画面的影响 + 添加N64和N64_plus旋转系统,修复None和None_plus搞反 #805 0.17.9: 暂停 Break 修复: