From d9a82878bf1b874868b35e37937433f3945f1d5c Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Tue, 19 Oct 2021 19:00:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=BB=84=E5=90=88=E9=94=AE?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=94=BB=E5=87=BB=E6=A8=A1=E5=BC=8F=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=9B=BA=E5=AE=9A=E4=B8=BA=E5=8D=95=E7=82=B9?= =?UTF-8?q?=E5=88=87=E6=8D=A2=20=E5=BE=AE=E8=B0=83=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.lua | 2 +- parts/gameFuncs.lua | 4 ++-- parts/gameTables.lua | 1 - parts/language/lang_en.lua | 5 ++--- parts/language/lang_es.lua | 5 ++--- parts/language/lang_fr.lua | 5 ++--- parts/language/lang_pt.lua | 5 ++--- parts/language/lang_symbol.lua | 5 ++--- parts/language/lang_zh.lua | 5 ++--- parts/language/lang_zh3.lua | 5 ++--- parts/modes/techmino49_e.lua | 13 ++----------- parts/modes/techmino49_h.lua | 13 ++----------- parts/modes/techmino49_u.lua | 13 ++----------- parts/modes/techmino99_e.lua | 13 ++----------- parts/modes/techmino99_h.lua | 13 ++----------- parts/modes/techmino99_u.lua | 13 ++----------- parts/player/gameEnv0.lua | 1 - parts/scenes/setting_game.lua | 20 ++++++++++---------- 18 files changed, 39 insertions(+), 102 deletions(-) diff --git a/main.lua b/main.lua index 53ad5bbf..c492589c 100644 --- a/main.lua +++ b/main.lua @@ -433,6 +433,7 @@ do end SETTING.appLock=nil SETTING.dataSaving=nil + SETTING.swap=nil if not SETTING.VKSkin then SETTING.VKSkin=1 end for _,v in next,SETTING.skin do if v<1 or v>17 then v=17 end end if SETTING.RS=='ZRS'or SETTING.RS=='BRS'or SETTING.RS=='ASCplus'or SETTING.RS=='C2sym'then SETTING.RS='TRS'end @@ -497,7 +498,6 @@ end --First start for phones if FIRSTLAUNCH and MOBILE then SETTING.VKSwitch=true - SETTING.swap=false SETTING.powerInfo=true SETTING.cleanCanvas=true end diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua index 9d6024e6..5158d250 100644 --- a/parts/gameFuncs.lua +++ b/parts/gameFuncs.lua @@ -497,7 +497,7 @@ do--function dumpBasicConfig() local gameSetting={ --Tuning 'das','arr','dascut','dropcut','sddas','sdarr', - 'ihs','irs','ims','RS','swap', + 'ihs','irs','ims','RS', --System 'skin','face', @@ -539,7 +539,7 @@ do--function resetGameData(args) local gameSetting={ --Tuning 'das','arr','dascut','dropcut','sddas','sdarr', - 'ihs','irs','ims','RS','swap','FTLock', + 'ihs','irs','ims','RS','FTLock', --System 'skin','face', diff --git a/parts/gameTables.lua b/parts/gameTables.lua index f26ea25b..57f60a64 100644 --- a/parts/gameTables.lua +++ b/parts/gameTables.lua @@ -606,7 +606,6 @@ do--Userdata tables ihs=true,irs=true,ims=true, holdMode='hold', RS='TRS', - swap=true, FTLock=true, --System diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index e8a37883..4e111bfe 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -317,19 +317,18 @@ return{ title="Game Settings", graphic="←Video", sound="Audio→", + layout="Layout", ctrl="Control Settings", key="Key Mappings", touch="Touch Settings", reTime="Start Delay", RS="Rotation System", - layout="Layout", menuPos="Menu Button Pos.", sysCursor="Use System Cursor", autoPause="Pause When Unfocused", - swap="Key Combination (Change Atk Mode)", - autoLogin="Auto Login on Start", autoSave="Auto Save New Records", + autoLogin="Auto Login on Start", simpMode="Simplistic Mode", }, setting_video={ diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 0bb932f0..8e3d5c48 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -285,19 +285,18 @@ return{ title="Ajustes del Juego", graphic="←Video", sound="Sonido→", + layout="Diseño", ctrl="Sensibilidad", key="Teclas", touch="Controles Táctiles", reTime="Retraso de Inicio", RS="Sistema de Rotación", - layout="Diseño", menuPos="Pos. del Botón de Menú", -- sysCursor="Use system cursor", autoPause="Pausar cuando la ventana no está enfocada", - swap="Combinación de Teclas (Cambiar Modo de Ataque)", - -- autoLogin="Auto Login on Start", autoSave="Autograbar Récords", + -- autoLogin="Auto Login on Start", simpMode="Modo Sencillo", }, setting_video={ diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index b502978d..7113a0b0 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -282,19 +282,18 @@ return{ graphic="←Vidéo", sound="Son→", + layout="Disposition", ctrl="Paramètres de contrôle", key="Touches", touch="Boutons virtuels", reTime="Délai de démarrage", RS="Système de rotation", - layout="Disposition", -- menuPos="Menu button pos.", -- sysCursor="Use system cursor", autoPause="Mettre en pause en cas de perte de focus", - swap="Combinaison de touches (changer le mode d'attaque)", - -- autoLogin="Auto Login on Start", -- autoSave="Auto save new-best", + -- autoLogin="Auto Login on Start", -- simpMode="Simple mode", }, setting_video={ diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 3a772fd6..adb99232 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -307,19 +307,18 @@ return{ title="Config. de jogo", graphic="←Video", sound="Som→", + layout="Layout", ctrl="Config. controle", key="Map. teclas", touch="Config. toque", reTime="Demora iniciação", RS="Sistema de rotação", - layout="Layout", -- menuPos="Menu button pos.", -- sysCursor="Use system cursor", autoPause="Pausar quando foco for perco", - swap="Combinação de tecla(Mudar modo de atk)", - -- autoLogin="Auto Login on Start", -- autoSave="Auto save new-best", + -- autoLogin="Auto Login on Start", -- simpMode="Simple mode", }, setting_video={ diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 89658a30..92ec8aab 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -195,19 +195,18 @@ return{ graphic="←Video", sound="Sound→", + layout="=-=-=", ctrl="=?=", key="=?", touch="_?", reTime="3-2-1", RS="''?", - layout="=-=-=", menuPos="←M→?", sysCursor="?→*", autoPause="A||", - swap="=+=+=", - autoLogin="#Log in#", autoSave="!!!>%", + autoLogin="#Log in#", simpMode=".", }, setting_video={ diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 3ab004da..d1858419 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -318,19 +318,18 @@ return{ title="游戏设置", graphic="←画面设置", sound="声音设置→", + layout="外观", ctrl="控制设置", key="键位设置", touch="触屏设置", reTime="开局等待时间", RS="旋转系统", - layout="外观", menuPos="菜单按钮位置", sysCursor="使用系统光标", autoPause="失去焦点自动暂停", - swap="组合键切换攻击模式", - autoLogin="启动时自动登录", autoSave="破纪录自动保存", + autoLogin="启动时自动登录", simpMode="简洁模式", }, setting_video={ diff --git a/parts/language/lang_zh3.lua b/parts/language/lang_zh3.lua index 0a40db43..26e82830 100644 --- a/parts/language/lang_zh3.lua +++ b/parts/language/lang_zh3.lua @@ -319,19 +319,18 @@ return{ title="游戏设置", graphic="←视频", sound="声音→", + layout="布局", ctrl="控制设置", key="键映射", touch="触摸设置", reTime="启动延迟", RS="轮换制", - layout="布局", menuPos="菜单按钮位置", sysCursor="使用系统游标", autoPause="心不在焉", - swap="组合键(更改攻击模式)", - autoLogin="启动时自动登录", autoSave="自动保存新的最佳", + autoLogin="启动时自动登录", simpMode="简单化风格", }, setting_video={ diff --git a/parts/modes/techmino49_e.lua b/parts/modes/techmino49_e.lua index 273281da..cabc5222 100644 --- a/parts/modes/techmino49_e.lua +++ b/parts/modes/techmino49_e.lua @@ -1,15 +1,6 @@ local function selectTarget(P) - if SETTING.swap then - for i=1,#P.keyPressing do - if P.keyPressing[i]then - P.keyPressing[i]=false - end - end - P.keyPressing[9]=true - else - P:changeAtkMode(P.atkMode<3 and P.atkMode+2 or 5-P.atkMode) - P.swappingAtkMode=30 - end + P:changeAtkMode(P.atkMode<3 and P.atkMode+2 or 5-P.atkMode) + P.swappingAtkMode=30 end return{ diff --git a/parts/modes/techmino49_h.lua b/parts/modes/techmino49_h.lua index 077b4843..18dfd9c6 100644 --- a/parts/modes/techmino49_h.lua +++ b/parts/modes/techmino49_h.lua @@ -1,15 +1,6 @@ local function selectTarget(P) - if SETTING.swap then - for i=1,#P.keyPressing do - if P.keyPressing[i]then - P.keyPressing[i]=false - end - end - P.keyPressing[9]=true - else - P:changeAtkMode(P.atkMode<3 and P.atkMode+2 or 5-P.atkMode) - P.swappingAtkMode=30 - end + P:changeAtkMode(P.atkMode<3 and P.atkMode+2 or 5-P.atkMode) + P.swappingAtkMode=30 end return{ diff --git a/parts/modes/techmino49_u.lua b/parts/modes/techmino49_u.lua index ed90d271..69dde784 100644 --- a/parts/modes/techmino49_u.lua +++ b/parts/modes/techmino49_u.lua @@ -1,15 +1,6 @@ local function selectTarget(P) - if SETTING.swap then - for i=1,#P.keyPressing do - if P.keyPressing[i]then - P.keyPressing[i]=false - end - end - P.keyPressing[9]=true - else - P:changeAtkMode(P.atkMode<3 and P.atkMode+2 or 5-P.atkMode) - P.swappingAtkMode=30 - end + P:changeAtkMode(P.atkMode<3 and P.atkMode+2 or 5-P.atkMode) + P.swappingAtkMode=30 end return{ diff --git a/parts/modes/techmino99_e.lua b/parts/modes/techmino99_e.lua index 6e8a6060..5d3c48a5 100644 --- a/parts/modes/techmino99_e.lua +++ b/parts/modes/techmino99_e.lua @@ -1,15 +1,6 @@ local function selectTarget(P) - if SETTING.swap then - for i=1,#P.keyPressing do - if P.keyPressing[i]then - P.keyPressing[i]=false - end - end - P.keyPressing[9]=true - else - P:changeAtkMode(P.atkMode<3 and P.atkMode+2 or 5-P.atkMode) - P.swappingAtkMode=30 - end + P:changeAtkMode(P.atkMode<3 and P.atkMode+2 or 5-P.atkMode) + P.swappingAtkMode=30 end return{ diff --git a/parts/modes/techmino99_h.lua b/parts/modes/techmino99_h.lua index 1ed3af50..7495ffb5 100644 --- a/parts/modes/techmino99_h.lua +++ b/parts/modes/techmino99_h.lua @@ -1,15 +1,6 @@ local function selectTarget(P) - if SETTING.swap then - for i=1,#P.keyPressing do - if P.keyPressing[i]then - P.keyPressing[i]=false - end - end - P.keyPressing[9]=true - else - P:changeAtkMode(P.atkMode<3 and P.atkMode+2 or 5-P.atkMode) - P.swappingAtkMode=30 - end + P:changeAtkMode(P.atkMode<3 and P.atkMode+2 or 5-P.atkMode) + P.swappingAtkMode=30 end return{ diff --git a/parts/modes/techmino99_u.lua b/parts/modes/techmino99_u.lua index d8aae392..4c1ae85c 100644 --- a/parts/modes/techmino99_u.lua +++ b/parts/modes/techmino99_u.lua @@ -1,15 +1,6 @@ local function selectTarget(P) - if SETTING.swap then - for i=1,#P.keyPressing do - if P.keyPressing[i]then - P.keyPressing[i]=false - end - end - P.keyPressing[9]=true - else - P:changeAtkMode(P.atkMode<3 and P.atkMode+2 or 5-P.atkMode) - P.swappingAtkMode=30 - end + P:changeAtkMode(P.atkMode<3 and P.atkMode+2 or 5-P.atkMode) + P.swappingAtkMode=30 end return{ diff --git a/parts/player/gameEnv0.lua b/parts/player/gameEnv0.lua index b436430d..5b557b03 100644 --- a/parts/player/gameEnv0.lua +++ b/parts/player/gameEnv0.lua @@ -3,7 +3,6 @@ return{ dascut=0,dropcut=0, sddas=2,sdarr=2, ihs=true,irs=true,ims=true, - swap=true, FTLock=true, ghostType='gray', diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 6a4490e6..18e9c823 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -37,19 +37,19 @@ scene.widgetList={ WIDGET.newButton{name="graphic", x=200, y=80, w=240,h=80,color='lC',font=35,code=swapScene('setting_video','swipeR')}, WIDGET.newButton{name="sound", x=1080, y=80, w=240,h=80,color='lC',font=35,code=swapScene('setting_sound','swipeL')}, + WIDGET.newButton{name="layout", x=250, y=540, w=200,h=70,color='lR',font=35,code=goScene'setting_skin'}, + WIDGET.newButton{name="ctrl", x=290, y=220, w=320,h=80,color='lY',font=35,code=goScene'setting_control'}, WIDGET.newButton{name="key", x=640, y=220, w=320,h=80,color='lG',font=35,code=goScene'setting_key'}, WIDGET.newButton{name="touch", x=990, y=220, w=320,h=80,color='lB',font=35,code=goScene'setting_touch'}, - WIDGET.newSlider{name="reTime", x=330, y=320, w=300,lim=180,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',disp=SETval('RS'), code=SETsto('RS'),list={'TRS','SRS','SRS_plus','SRS_X','BiRS','ARS_Z','ASC','ASC_plus','C2','C2_sym','Classic','Classic_plus','None','None_plus'}}, - WIDGET.newButton{name="layout", x=250, y=540, w=200,h=70,font=35, code=goScene'setting_skin'}, - WIDGET.newSelector{name="menuPos", x=980, y=320, w=300,color='O',disp=SETval('menuPos'), code=SETsto('menuPos'),list={'left','middle','right'}}, - WIDGET.newSwitch{name="sysCursor" ,x=1060, y=390, lim=580,disp=SETval('sysCursor'), code=switchCursor}, - WIDGET.newSwitch{name="autoPause", x=1060, y=450, lim=580,disp=SETval('autoPause'), code=SETrev('autoPause')}, - WIDGET.newSwitch{name="swap", x=1060, y=510, lim=580,disp=SETval('swap'), code=SETrev('swap')}, - WIDGET.newSwitch{name="autoLogin", x=950, y=600, lim=580,disp=SETval('autoLogin'), code=SETrev('autoLogin')}, - WIDGET.newSwitch{name="autoSave", x=600, y=800, lim=430,disp=SETval('autoSave'), code=SETrev('autoSave')}, - WIDGET.newSwitch{name="simpMode", x=1060, y=800, lim=380,disp=SETval('simpMode'), + WIDGET.newSlider{name="reTime", x=330, y=320, w=300,lim=180,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', disp=SETval('RS'), code=SETsto('RS'),list={'TRS','SRS','SRS_plus','SRS_X','BiRS','ARS_Z','ASC','ASC_plus','C2','C2_sym','Classic','Classic_plus','None','None_plus'}}, + WIDGET.newSelector{name="menuPos", x=980, y=320, w=300,color='O', disp=SETval('menuPos'), code=SETsto('menuPos'),list={'left','middle','right'}}, + WIDGET.newSwitch{name="sysCursor" ,x=1060, y=390, lim=580, disp=SETval('sysCursor'),code=switchCursor}, + WIDGET.newSwitch{name="autoPause", x=1060, y=450, lim=580, disp=SETval('autoPause'),code=SETrev('autoPause')}, + WIDGET.newSwitch{name="autoSave", x=1060, y=500, lim=580, disp=SETval('autoSave'), code=SETrev('autoSave')}, + WIDGET.newSwitch{name="autoLogin", x=960, y=580, lim=480, disp=SETval('autoLogin'),code=SETrev('autoLogin')}, + WIDGET.newSwitch{name="simpMode", x=960, y=640, lim=480, disp=SETval('simpMode'), code=function() SETTING.simpMode=not SETTING.simpMode for i=1,#SCN.stack,2 do