From 18471a201f3470538185f10ccb49ec8a781b8cd8 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Tue, 14 Sep 2021 17:23:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=96=B0=E5=A2=9E=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E4=BD=BF=E7=94=A8=E7=B3=BB=E7=BB=9F=E5=85=89=E6=A0=87?= =?UTF-8?q?=E7=9A=84=E9=80=89=E9=A1=B9=EF=BC=88=E7=B3=BB=E7=BB=9F=E5=85=89?= =?UTF-8?q?=E6=A0=87=E4=B8=8D=E5=8F=97=E6=8C=89=E9=94=AE=E5=8D=B3=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E7=9A=84=E5=BD=B1=E5=93=8D=EF=BC=89=20close=20#295?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.lua | 3 ++- parts/gametoolfunc.lua | 5 +++++ parts/globalTables.lua | 1 + parts/language/lang_en.lua | 3 ++- parts/language/lang_es.lua | 3 ++- parts/language/lang_fr.lua | 3 ++- parts/language/lang_pt.lua | 3 ++- parts/language/lang_symbol.lua | 3 ++- parts/language/lang_zh.lua | 3 ++- parts/scenes/setting_game.lua | 7 ++++--- 10 files changed, 24 insertions(+), 10 deletions(-) diff --git a/main.lua b/main.lua index a5416b72..963fa11a 100644 --- a/main.lua +++ b/main.lua @@ -36,7 +36,6 @@ math.randomseed(os.time()*626) love.setDeprecationOutput(false) love.keyboard.setKeyRepeat(true) love.keyboard.setTextInput(false) -love.mouse.setVisible(false) if SYSTEM=='Android'or SYSTEM=='iOS'then local w,h,f=love.window.getMode() f.resizable=false @@ -60,6 +59,7 @@ do local gc_setColor,gc_draw=love.graphics.setColor,love.graphics.draw local ms=love.mouse Z.setCursor(function(time,x,y) + if not SETTING.sysCursor then local R=int((time+1)/2)%7+1 _=minoColor[SETTING.skin[R]] gc_setColor(_[1],_[2],_[3],min(abs(1-time%2),.3)) @@ -67,6 +67,7 @@ do gc_draw(TEXTURE.miniBlock[R],x,y,time%3.14159265359*4,16,16,_[2]+.5,#BLOCKS[R][0]-_[1]-.5) gc_setColor(1,1,1) gc_draw(ms.isDown(1)and holdImg or normImg,x,y,nil,nil,nil,8,8) + end end) end diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index 57512b5d..b812eb25 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -24,11 +24,16 @@ end function applySettings() love.window.setFullscreen(SETTING.fullscreen) love.audio.setVolume(SETTING.mainVol) + love.mouse.setVisible(SETTING.sysCursor) LANG.set(SETTING.lang) VK.setShape(SETTING.VKSkin) applyBlockSatur(SETTING.blockSatur) applyFieldSatur(SETTING.fieldSatur) end +function switchCursor() + SETTING.sysCursor=not SETTING.sysCursor + love.mouse.setVisible(SETTING.sysCursor) +end function switchFullscreen() SETTING.fullscreen=not SETTING.fullscreen love.window.setFullscreen(SETTING.fullscreen) diff --git a/parts/globalTables.lua b/parts/globalTables.lua index bad06d5e..0bb40a77 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -261,6 +261,7 @@ SETTING={--Settings fine=false, autoSave=false, simpMode=false, + sysCursor=true, lang=1, skinSet='crystal_scf', skin={ diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index ff8a74b8..ea526d9d 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -321,8 +321,9 @@ return{ reTime="Start Delay", RS="Rotation System", layout="Layout", - autoPause="Pause while unfocused", menuPos="Menu button pos.", + sysCursor="Use system cursur", + autoPause="Pause while unfocused", swap="Key Combination (Change Atk. Mode)", autoSave="Auto save new-best", simpMode="Simplistic Style", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index e6327ca8..c8fe459c 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -287,8 +287,9 @@ return{ reTime="Retraso de Inicio", RS="Sistema de Rotación", layout="Diseño", - autoPause="Pausar cuando la ventana no está enfocada", menuPos="Pos. del Botón de Menú", + -- sysCursor="Use system cursur", + autoPause="Pausar cuando la ventana no está enfocada", swap="Combinación de Teclas (Cambiar Modo de Ataque)", autoSave="Autograbar Récords", simpMode="Modo Sencillo", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index b7d3496c..8b2ab32a 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -284,8 +284,9 @@ return{ reTime="Délai de démarrage", RS="Système de rotation", layout="Disposition", - autoPause="Mettre en pause en cas de perte de focus", -- menuPos="Menu button pos.", + -- sysCursor="Use system cursur", + autoPause="Mettre en pause en cas de perte de focus", swap="Combinaison de touches (changer le mode d'attaque)", -- autoSave="Auto save new-best", -- simpMode="Simple mode", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index b69e46de..5163ceea 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -309,8 +309,9 @@ return{ reTime="Demora iniciação", RS="Sistema de rotação", layout="Layout", - autoPause="Pausar quando foco for perco", -- menuPos="Menu button pos.", + -- sysCursor="Use system cursur", + autoPause="Pausar quando foco for perco", swap="Combinação de tecla(Mudar modo de atk)", -- autoSave="Auto save new-best", -- simpMode="Simple mode", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index ac846809..34e10ed6 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -203,8 +203,9 @@ return{ reTime="3-2-1", RS="''?", layout="=-=-=", - autoPause="A||", menuPos="←M→?", + sysCursor="?→*", + autoPause="A||", swap="=+=+=", autoSave="!!!>%", simpMode=".", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index c83353f7..255adc69 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -321,8 +321,9 @@ return{ reTime="开局等待时间", RS="旋转系统", layout="外观", - autoPause="失去焦点自动暂停", menuPos="菜单按钮位置", + sysCursor="使用系统光标", + autoPause="失去焦点自动暂停", swap="组合键切换攻击模式", autoSave="破纪录自动保存", simpMode="简洁模式", diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 49952c4d..74716482 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -43,9 +43,10 @@ scene.widgetList={ WIDGET.newSlider{name="reTime", x=330, y=320, w=300,unit=10,disp=SETval('reTime'),code=SETsto('reTime'),show=function(S)return(.5+S.disp()*.25).."s"end}, WIDGET.newSelector{name="RS", x=300, y=420, w=300,color='S',list={'TRS','SRS','SRS_plus','SRS_X','BiRS','ARS_Z','ASC','ASC_plus','C2','C2_sym','Classic','Classic_plus','None','None_plus'},disp=SETval('RS'),code=SETsto('RS')}, WIDGET.newButton{name="layout", x=250, y=540, w=200,h=70,font=35, code=goScene'setting_skin'}, - WIDGET.newSwitch{name="autoPause", x=1060, y=320, disp=SETval('autoPause'),code=SETrev('autoPause')}, - WIDGET.newSelector{name="menuPos", x=980, y=420, w=300,color='O',list={'left','middle','right'},disp=SETval('menuPos'),code=SETsto('menuPos')}, - WIDGET.newSwitch{name="swap", x=1060, y=520, disp=SETval('swap'), code=SETrev('swap')}, + WIDGET.newSelector{name="menuPos", x=980, y=320, w=300,color='O',list={'left','middle','right'},disp=SETval('menuPos'),code=SETsto('menuPos')}, + WIDGET.newSwitch{name="sysCursor" ,x=1060, y=390, disp=SETval('sysCursor'),code=switchCursor}, + WIDGET.newSwitch{name="autoPause", x=1060, y=450, disp=SETval('autoPause'),code=SETrev('autoPause')}, + WIDGET.newSwitch{name="swap", x=1060, y=510, disp=SETval('swap'), code=SETrev('swap')}, WIDGET.newSwitch{name="autoSave", x=600, y=800, disp=SETval('autoSave'), code=SETrev('autoSave')}, WIDGET.newSwitch{name="simpMode", x=1060, y=800, disp=SETval('simpMode'), code=function()